You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2019/04/04 23:12:06 UTC
[incubator-pinot] branch master updated: Exit 1 when caught
exception in Pinot Admin command. (#4065)
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 641e401 Exit 1 when caught exception in Pinot Admin command. (#4065)
641e401 is described below
commit 641e401061b33ede09868e4a2d488515a8f610ce
Author: Xiang Fu <fx...@gmail.com>
AuthorDate: Thu Apr 4 16:12:01 2019 -0700
Exit 1 when caught exception in Pinot Admin command. (#4065)
* Exit 1 when caught exception in Pinot Admin command.
* Only exit(1) for failure requets
---
.../pinot/integration/tests/ChaosMonkeyIntegrationTest.java | 1 +
.../java/org/apache/pinot/tools/admin/PinotAdministrator.java | 9 +++++----
.../org/apache/pinot/tools/admin/command/AddTableCommand.java | 5 +++++
3 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ChaosMonkeyIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ChaosMonkeyIntegrationTest.java
index 8dcb9ed..5bcd7d6 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ChaosMonkeyIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/ChaosMonkeyIntegrationTest.java
@@ -52,6 +52,7 @@ public class ChaosMonkeyIntegrationTest {
private Process runAdministratorCommand(String[] args) {
String classpath = System.getProperty("java.class.path");
+ System.getProperties().setProperty("pinot.admin.system.exit", "false");
List<String> completeArgs = new ArrayList<>();
completeArgs.add("java");
completeArgs.add("-Xms4G");
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/PinotAdministrator.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/PinotAdministrator.java
index b2c3335..f490e2c 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/PinotAdministrator.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/PinotAdministrator.java
@@ -81,8 +81,7 @@ public class PinotAdministrator {
return _status;
}
- public void execute(String[] args)
- throws Exception {
+ public void execute(String[] args) {
try {
CmdLineParser parser = new CmdLineParser(this);
parser.parseArgument(args);
@@ -102,10 +101,12 @@ public class PinotAdministrator {
}
}
- public static void main(String[] args)
- throws Exception {
+ public static void main(String[] args) {
PinotAdministrator pinotAdministrator = new PinotAdministrator();
pinotAdministrator.execute(args);
+ if (!System.getProperties().getProperty("pinot.admin.system.exit", "true").equalsIgnoreCase("false")) {
+ System.exit(pinotAdministrator.getStatus() ? 0 : 1);
+ }
}
public void printUsage() {
diff --git a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
index 7079303..bc57050 100644
--- a/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
+++ b/pinot-tools/src/main/java/org/apache/pinot/tools/admin/command/AddTableCommand.java
@@ -87,6 +87,11 @@ public class AddTableCommand extends AbstractBaseAdminCommand implements Command
return this;
}
+ public AddTableCommand setControllerHost(String controllerHost) {
+ _controllerHost = controllerHost;
+ return this;
+ }
+
public AddTableCommand setControllerPort(String controllerPort) {
_controllerPort = controllerPort;
return this;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org