This is an automated email from the ASF dual-hosted git repository. xiangfu pushed a commit to branch fixing_start_role_conf_cast in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit a27b4ca71ea3202a39a3ea40617d367ec803ea79 Author: Xiang Fu <[email protected]> AuthorDate: Wed Jun 17 12:15:29 2020 -0700 Fixing ControllerConf casting issue --- .../main/java/org/apache/pinot/controller/ControllerConf.java | 10 ++++++++++ .../org/apache/pinot/tools/service/PinotServiceManager.java | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java index 7ae059d..f4ad1db 100644 --- a/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java +++ b/pinot-controller/src/main/java/org/apache/pinot/controller/ControllerConf.java @@ -20,6 +20,7 @@ package org.apache.pinot.controller; import java.io.File; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; import java.util.Random; import org.apache.commons.configuration.Configuration; @@ -171,6 +172,15 @@ public class ControllerConf extends PropertiesConfiguration { super(); } + public ControllerConf(Configuration conf) { + super(); + Iterator<String> keysIterator = conf.getKeys(); + while(keysIterator.hasNext()) { + String key = keysIterator.next(); + this.setProperty(key, conf.getProperty(key)); + } + } + public void setLocalTempDir(String localTempDir) { setProperty(LOCAL_TEMP_DIR, localTempDir); } diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManager.java b/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManager.java index d131aa6..e1a187e 100644 --- a/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManager.java +++ b/pinot-tools/src/main/java/org/apache/pinot/tools/service/PinotServiceManager.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.configuration.Configuration; +import org.apache.commons.configuration.PropertiesConfiguration; import org.apache.pinot.broker.broker.helix.HelixBrokerStarter; import org.apache.pinot.common.utils.NetUtil; import org.apache.pinot.common.utils.ServiceStatus; @@ -85,7 +86,7 @@ public class PinotServiceManager { throws Exception { switch (role) { case CONTROLLER: - return startController((ControllerConf) conf); + return startController(new ControllerConf(conf)); case BROKER: return startBroker(conf); case SERVER: --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
