Skip to content

Fix broker client tls settings error #6128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sijie merged 4 commits into from
Feb 24, 2020
Merged

Fix broker client tls settings error #6128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a72f0be
fix broker client tls settings error
jiazhai Jan 23, 2020
35866c3
change following comments
jiazhai Feb 2, 2020
cf898a3
python-ut: move print before assert
jiazhai Feb 23, 2020
71e13c3
change to make backward compat
jiazhai Feb 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions pulsar-broker/src/main/java/org/apache/pulsar/broker/PulsarService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -910,6 +910,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());
Expand Down
8 changes: 4 additions & 4 deletions pulsar-client-cpp/python/pulsar_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down