You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2022/10/20 04:29:45 UTC
[pulsar] 02/02: [fix] The Pulsar standalone bookie is not getting passed the config from standalone.conf (#18126)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch branch-2.11
in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit a0e53262db02c983233b24994f2a79cb7367606f
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Wed Oct 19 21:22:16 2022 -0700
[fix] The Pulsar standalone bookie is not getting passed the config from standalone.conf (#18126)
---
.../src/main/java/org/apache/pulsar/PulsarStandalone.java | 4 ++++
.../java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java | 10 +++++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
index 219a1ddf2ea..1191b98f8c6 100644
--- a/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
+++ b/pulsar-broker/src/main/java/org/apache/pulsar/PulsarStandalone.java
@@ -445,7 +445,11 @@ public class PulsarStandalone implements AutoCloseable {
} else {
log.info("Starting BK with metadata store:", metadataStoreUrl);
}
+
+ ServerConfiguration bkServerConf = new ServerConfiguration();
+ bkServerConf.loadConf(new File(configFile).toURI().toURL());
bkCluster = BKCluster.builder()
+ .baseServerConfiguration(bkServerConf)
.metadataServiceUri(metadataStoreUrl)
.bkPort(bkPort)
.numBookies(numOfBk)
diff --git a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java
index d7be00ab259..53825cae2b2 100644
--- a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java
+++ b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/bookkeeper/BKCluster.java
@@ -71,6 +71,8 @@ public class BKCluster implements AutoCloseable {
protected final ClientConfiguration baseClientConf;
public static class BKClusterConf {
+
+ private ServerConfiguration baseServerConfiguration;
private String metadataServiceUri;
private int numBookies = 1;
private String dataDir;
@@ -78,6 +80,11 @@ public class BKCluster implements AutoCloseable {
private boolean clearOldData;
+ public BKClusterConf baseServerConfiguration(ServerConfiguration baseServerConfiguration) {
+ this.baseServerConfiguration = baseServerConfiguration;
+ return this;
+ }
+
public BKClusterConf metadataServiceUri(String metadataServiceUri) {
this.metadataServiceUri = metadataServiceUri;
return this;
@@ -115,7 +122,8 @@ public class BKCluster implements AutoCloseable {
private BKCluster(BKClusterConf bkClusterConf) throws Exception {
this.clusterConf = bkClusterConf;
- this.baseConf = newBaseServerConfiguration();
+ this.baseConf = bkClusterConf.baseServerConfiguration != null
+ ? bkClusterConf.baseServerConfiguration : newBaseServerConfiguration();
this.baseClientConf = newBaseClientConfiguration();
this.store =