Fix broker client tls settings error (#6128)

when broker create the inside client, it sets tlsTrustCertsFilePath as "getTlsCertificateFilePath()", but it should be "getBrokerClientTrustCertsFilePath()" (cherry picked from commit 1fcccd6)
apache · Apr 13, 2020 · 942e340 · 942e340
1 parent 5c76eb4
commit 942e340
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
@@ -880,6 +880,14 @@ public synchronized PulsarClient getClient() throws PulsarServerException {
                     .enableTls(this.getConfiguration().isTlsEnabled())
                     .allowTlsInsecureConnection(this.getConfiguration().isTlsAllowInsecureConnection())
                     .tlsTrustCertsFilePath(this.getConfiguration().getTlsCertificateFilePath());
+
+                if (this.getConfiguration().isBrokerClientTlsEnabled()) {
+                    builder.tlsTrustCertsFilePath(
+                        isNotBlank(this.getConfiguration().getBrokerClientTrustCertsFilePath())
+                            ? this.getConfiguration().getBrokerClientTrustCertsFilePath()
+                            : this.getConfiguration().getTlsCertificateFilePath());
+                }
+
                 if (isNotBlank(this.getConfiguration().getBrokerClientAuthenticationPlugin())) {
                     builder.authentication(this.getConfiguration().getBrokerClientAuthenticationPlugin(),
                                            this.getConfiguration().getBrokerClientAuthenticationParameters());

diff --git a/pulsar-client-cpp/python/pulsar_test.py b/pulsar-client-cpp/python/pulsar_test.py
@@ -152,7 +152,7 @@ def test_redelivery_count(self):
         producer.send(b'hello')
 
         redelivery_count = 0
-        for i in range(4):  
+        for i in range(4):
             msg = consumer.receive(TM)
             print("Received message %s" % msg.data())
             consumer.negative_acknowledge(msg)
@@ -668,13 +668,13 @@ def test_publish_compact_and_consume(self):
         while True:
             s=doHttpGet(url).decode('utf-8')
             if 'RUNNING' in s:
-                print("Compact still running")
                 print(s)
+                print("Compact still running")
                 time.sleep(0.2)
             else:
-                self.assertTrue('SUCCESS' in s)
-                print("Compact Complete now")
                 print(s)
+                print("Compact Complete now")
+                self.assertTrue('SUCCESS' in s)
                 break
 
         # after compaction completes the compacted ledger is recorded