This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 2f640ff868 [bugfix] Let StartControllerCommand also handle
"pinot.zk.server", "pinot.cluster.name" in default conf/pinot-controller.conf
(#9739)
2f640ff868 is described below
commit 2f640ff8683728b844be9e045d5ce0f026d09e71
Author: Nguyễn Đình Thắng <[email protected]>
AuthorDate: Sun Nov 6 16:40:56 2022 +0700
[bugfix] Let StartControllerCommand also handle "pinot.zk.server",
"pinot.cluster.name" in default conf/pinot-controller.conf (#9739)
* Let StartControllerCommand also handle "pinot.zk.server"
* Let StartControllerCommand also handle 'pinot.cluster.name'
---
.../apache/pinot/tools/admin/command/StartControllerCommand.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
index 8815edf602..660ab1bfc4 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartControllerCommand.java
@@ -201,11 +201,13 @@ public class StartControllerCommand extends
AbstractBaseAdminCommand implements
Map<String, Object> properties = new HashMap<>();
if (_configFileName != null) {
properties.putAll(PinotConfigUtils.generateControllerConf(_configFileName));
+ ControllerConf conf = new ControllerConf(properties);
+
// Override the zkAddress and clusterName to ensure ServiceManager is
connecting to the right Zookeeper and
// Cluster.
// Configs existence is already verified.
- _zkAddress = properties.get(ControllerConf.ZK_STR).toString();
- _clusterName =
properties.get(ControllerConf.HELIX_CLUSTER_NAME).toString();
+ _zkAddress = conf.getZkStr();
+ _clusterName = conf.getHelixClusterName();
} else {
if (_controllerHost == null) {
_controllerHost = NetUtils.getHostAddress();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
