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/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 4fdf01b Fixing init controller conf for StartControllerCommand (#7132)
4fdf01b is described below
commit 4fdf01b0bfd77569d35078974108cbfec49d2a97
Author: Xiang Fu <[email protected]>
AuthorDate: Wed Jul 7 00:48:27 2021 -0700
Fixing init controller conf for StartControllerCommand (#7132)
---
.../java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java | 3 ++-
.../org/apache/pinot/tools/admin/command/StartControllerCommand.java | 3 ++-
.../java/org/apache/pinot/tools/admin/command/StartMinionCommand.java | 3 ++-
.../java/org/apache/pinot/tools/admin/command/StartServerCommand.java | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java
index 03d5ccb..564b254 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartBrokerCommand.java
@@ -118,9 +118,10 @@ public class StartBrokerCommand extends
AbstractBaseAdminCommand implements Comm
throws Exception {
try {
LOGGER.info("Executing command: " + toString());
+ Map<String, Object> brokerConf = getBrokerConf();
StartServiceManagerCommand startServiceManagerCommand =
new
StartServiceManagerCommand().setZkAddress(_zkAddress).setClusterName(_clusterName).setPort(-1)
- .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.BROKER, getBrokerConf());
+ .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.BROKER, brokerConf);
startServiceManagerCommand.execute();
String pidFile = ".pinotAdminBroker-" + System.currentTimeMillis() +
".pid";
savePID(System.getProperty("java.io.tmpdir") + File.separator + pidFile);
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 35ac8d0..321a05b 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
@@ -142,9 +142,10 @@ public class StartControllerCommand extends
AbstractBaseAdminCommand implements
throws Exception {
try {
LOGGER.info("Executing command: " + toString());
+ Map<String, Object> controllerConf = getControllerConf();
StartServiceManagerCommand startServiceManagerCommand =
new
StartServiceManagerCommand().setZkAddress(_zkAddress).setClusterName(_clusterName).setPort(-1)
- .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.CONTROLLER, getControllerConf());
+ .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.CONTROLLER, controllerConf);
startServiceManagerCommand.execute();
String pidFile = ".pinotAdminController-" + System.currentTimeMillis() +
".pid";
savePID(System.getProperty("java.io.tmpdir") + File.separator + pidFile);
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartMinionCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartMinionCommand.java
index 6a26028..9d0b6a3 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartMinionCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartMinionCommand.java
@@ -92,9 +92,10 @@ public class StartMinionCommand extends
AbstractBaseAdminCommand implements Comm
throws Exception {
try {
LOGGER.info("Executing command: " + toString());
+ Map<String, Object> minionConf = getMinionConf();
StartServiceManagerCommand startServiceManagerCommand =
new
StartServiceManagerCommand().setZkAddress(_zkAddress).setClusterName(_clusterName).setPort(-1)
- .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.MINION, getMinionConf());
+ .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.MINION, minionConf);
startServiceManagerCommand.execute();
String pidFile = ".pinotAdminMinion-" + System.currentTimeMillis() +
".pid";
savePID(System.getProperty("java.io.tmpdir") + File.separator + pidFile);
diff --git
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java
index 804f011..4b1fc47 100644
---
a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java
+++
b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/StartServerCommand.java
@@ -149,9 +149,10 @@ public class StartServerCommand extends
AbstractBaseAdminCommand implements Comm
throws Exception {
try {
LOGGER.info("Executing command: " + toString());
+ Map<String, Object> serverConf = getServerConf();
StartServiceManagerCommand startServiceManagerCommand =
new
StartServiceManagerCommand().setZkAddress(_zkAddress).setClusterName(_clusterName).setPort(-1)
- .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.SERVER, getServerConf());
+ .setBootstrapServices(new
String[0]).addBootstrapService(ServiceRole.SERVER, serverConf);
startServiceManagerCommand.execute();
String pidFile = ".pinotAdminServer-" + System.currentTimeMillis() +
".pid";
savePID(System.getProperty("java.io.tmpdir") + File.separator + pidFile);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
