This is an automated email from the ASF dual-hosted git repository.
nicoloboschi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 002fa49692f [improve][cli] pulsar cli: use return code 1 for general
error (#18946)
002fa49692f is described below
commit 002fa49692ff4b8b038bf2edeeb3b32ed218e64f
Author: Paul Gier <[email protected]>
AuthorDate: Sat Dec 17 00:51:20 2022 -0600
[improve][cli] pulsar cli: use return code 1 for general error (#18946)
---
.../org/apache/pulsar/client/cli/PulsarClientTool.java | 6 +++---
.../org/apache/pulsar/io/docs/ConnectorDocGenerator.java | 2 +-
.../apache/pulsar/metadata/impl/PulsarZooKeeperClient.java | 2 +-
.../apache/pulsar/proxy/server/ProxyServiceStarter.java | 2 +-
.../pulsar/proxy/socket/client/PerformanceClient.java | 6 +++---
.../java/org/apache/pulsar/testclient/BrokerMonitor.java | 2 +-
.../apache/pulsar/testclient/CmdGenerateDocumentation.java | 4 ++--
.../org/apache/pulsar/testclient/LoadSimulationClient.java | 2 +-
.../apache/pulsar/testclient/LoadSimulationController.java | 2 +-
.../org/apache/pulsar/testclient/ManagedLedgerWriter.java | 6 +++---
.../apache/pulsar/testclient/PerformanceBaseArguments.java | 2 +-
.../org/apache/pulsar/testclient/PerformanceConsumer.java | 12 ++++++------
.../org/apache/pulsar/testclient/PerformanceProducer.java | 14 +++++++-------
.../org/apache/pulsar/testclient/PerformanceReader.java | 8 ++++----
.../apache/pulsar/testclient/PerformanceTransaction.java | 10 +++++-----
.../pulsar/testclient/PerformanceBaseArgumentsTest.java | 5 +----
16 files changed, 41 insertions(+), 44 deletions(-)
diff --git
a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java
b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java
index 6083fbd7301..3418850d6ce 100644
---
a/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java
+++
b/pulsar-client-tools/src/main/java/org/apache/pulsar/client/cli/PulsarClientTool.java
@@ -155,7 +155,7 @@ public class PulsarClientTool {
} catch (IllegalArgumentException e) {
System.out.println("Incorrect proxyProtocol name '" +
proxyProtocolString + "'");
e.printStackTrace();
- System.exit(-1);
+ System.exit(1);
}
}
}
@@ -190,7 +190,7 @@ public class PulsarClientTool {
if (isNotBlank(rootParams.proxyServiceURL)) {
if (rootParams.proxyProtocol == null) {
System.out.println("proxy-protocol must be provided with
proxy-url");
- System.exit(-1);
+ System.exit(1);
}
clientBuilder.proxyServiceUrl(rootParams.proxyServiceURL,
rootParams.proxyProtocol);
}
@@ -256,7 +256,7 @@ public class PulsarClientTool {
public static void main(String[] args) throws Exception {
if (args.length == 0) {
System.out.println("Usage: pulsar-client CONF_FILE_PATH [options]
[command] [command options]");
- System.exit(-1);
+ System.exit(1);
}
String configFile = args[0];
Properties properties = new Properties();
diff --git
a/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java
b/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java
index 927d94b3e19..fe12b2b11ce 100644
---
a/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java
+++
b/pulsar-io/docs/src/main/java/org/apache/pulsar/io/docs/ConnectorDocGenerator.java
@@ -164,7 +164,7 @@ public class ConnectorDocGenerator {
}
} catch (Exception e) {
commander.usage();
- Runtime.getRuntime().exit(-1);
+ Runtime.getRuntime().exit(1);
return;
}
diff --git
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
index 632bcbf2107..cc29b615c11 100644
---
a/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
+++
b/pulsar-metadata/src/main/java/org/apache/pulsar/metadata/impl/PulsarZooKeeperClient.java
@@ -139,7 +139,7 @@ public class PulsarZooKeeperClient extends ZooKeeper
implements Watcher, AutoClo
}, connectRetryPolicy, rateLimiter, createClientStats);
} catch (Exception e) {
log.error("Gave up reconnecting to ZooKeeper : ", e);
- Runtime.getRuntime().exit(-1);
+ Runtime.getRuntime().exit(1);
}
}
diff --git
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
index 923072a4329..bda50a4d689 100644
---
a/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
+++
b/pulsar-proxy/src/main/java/org/apache/pulsar/proxy/server/ProxyServiceStarter.java
@@ -132,7 +132,7 @@ public class ProxyServiceStarter {
}
} catch (Exception e) {
jcommander.usage();
- System.exit(-1);
+ System.exit(1);
}
// load config file
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java
index c42e876f1fe..3a59e00160f 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/proxy/socket/client/PerformanceClient.java
@@ -146,12 +146,12 @@ public class PerformanceClient {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.help) {
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (isBlank(arguments.authPluginClassName) &&
!isBlank(arguments.deprecatedAuthPluginClassName)) {
@@ -161,7 +161,7 @@ public class PerformanceClient {
if (arguments.topics.size() != 1) {
System.err.println("Only one topic name is allowed");
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.confFile != null) {
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java
index 47eb2a6c4b1..c209c34a3d7 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/BrokerMonitor.java
@@ -479,7 +479,7 @@ public class BrokerMonitor {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
final ZooKeeper zkClient = new ZooKeeper(arguments.connectString,
ZOOKEEPER_TIMEOUT_MILLIS, null);
final BrokerMonitor monitor = new BrokerMonitor(zkClient);
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java
index ff1800e7ae7..e3aca988655 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/CmdGenerateDocumentation.java
@@ -53,12 +53,12 @@ public class CmdGenerateDocumentation {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.help) {
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
Map<String, Class<?>> cmdClassMap = new LinkedHashMap<>();
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java
index c521c54c5b9..64330ae2eee 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationClient.java
@@ -343,7 +343,7 @@ public class LoadSimulationClient {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
PerfClientUtils.printJVMInformation(log);
(new LoadSimulationClient(mainArguments)).run();
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java
index 81f5329051b..dca6f92c166 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/LoadSimulationController.java
@@ -723,7 +723,7 @@ public class LoadSimulationController {
} catch (Exception ex) {
System.out.println(ex.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
(new LoadSimulationController(arguments)).run();
}
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java
index 997d5a31f2e..336461e7a68 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/ManagedLedgerWriter.java
@@ -149,12 +149,12 @@ public class ManagedLedgerWriter {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.help) {
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.metadataStoreUrl == null && arguments.zookeeperServers
== null) {
@@ -280,7 +280,7 @@ public class ManagedLedgerWriter {
@Override
public void addFailed(ManagedLedgerException
exception, Object ctx) {
log.warn("Write error on message", exception);
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
};
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java
index 5f8551b9909..f08a7750723 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceBaseArguments.java
@@ -157,7 +157,7 @@ public abstract class PerformanceBaseArguments {
} catch (IllegalArgumentException e) {
System.out.println("Incorrect proxyProtocol name '" +
proxyProtocolString + "'");
e.printStackTrace();
- exit(-1);
+ exit(1);
}
}
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java
index da05fcb1893..11a23ca05e0 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceConsumer.java
@@ -211,12 +211,12 @@ public class PerformanceConsumer {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.help) {
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (isBlank(arguments.authPluginClassName) &&
!isBlank(arguments.deprecatedAuthPluginClassName)) {
@@ -228,7 +228,7 @@ public class PerformanceConsumer {
System.out.printf("invalid option: '%s'\nTo use a topic with
the name '%s', "
+ "please use a fully qualified topic name\n", arg,
arg);
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
@@ -244,14 +244,14 @@ public class PerformanceConsumer {
} else {
System.out.println("The size of topics list should be equal to
--num-topics");
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
if (arguments.subscriptionType == SubscriptionType.Exclusive &&
arguments.numConsumers > 1) {
System.out.println("Only one consumer is allowed when
subscriptionType is Exclusive");
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.subscriptions != null && arguments.subscriptions.size()
!= arguments.numSubscriptions) {
@@ -268,7 +268,7 @@ public class PerformanceConsumer {
} else {
System.out.println("The size of subscriptions list should be
equal to --num-subscriptions");
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
arguments.fillArgumentsFromProperties();
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java
index 6600e3083e0..9aedc8c4bd3 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceProducer.java
@@ -280,12 +280,12 @@ public class PerformanceProducer {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.help) {
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (isBlank(arguments.authPluginClassName) &&
!isBlank(arguments.deprecatedAuthPluginClassName)) {
@@ -297,7 +297,7 @@ public class PerformanceProducer {
System.out.printf("invalid option: '%s'\nTo use a topic with
the name '%s', "
+ "please use a fully qualified topic name\n", arg,
arg);
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
@@ -313,7 +313,7 @@ public class PerformanceProducer {
} else {
System.out.println("The size of topics list should be equal to
--num-topic");
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
@@ -379,7 +379,7 @@ public class PerformanceProducer {
log.error("Topic {} already exists but it has a
wrong number of partitions: {}, "
+ "expecting {}",
topic,
partitionedTopicMetadata.partitions, arguments.partitions);
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
}
@@ -692,7 +692,7 @@ public class PerformanceProducer {
log.warn("Write message error with exception", ex);
messagesFailed.increment();
if (arguments.exitOnFailure) {
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
return null;
});
@@ -753,7 +753,7 @@ public class PerformanceProducer {
if (null != client) {
try {
client.close();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
} catch (PulsarClientException e) {
log.error("Failed to close test client", e);
}
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
index 6adb0a9ca44..78d8e5f5915 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceReader.java
@@ -114,12 +114,12 @@ public class PerformanceReader {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.help) {
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
for (String arg : arguments.topic) {
@@ -127,7 +127,7 @@ public class PerformanceReader {
System.out.printf("invalid option: '%s'\nTo use a topic with
the name '%s', "
+ "please use a fully qualified topic name\n", arg,
arg);
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
@@ -143,7 +143,7 @@ public class PerformanceReader {
} else {
System.out.println("The size of topics list should be equal to
--num-topics");
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
arguments.fillArgumentsFromProperties();
diff --git
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java
index a7754516afe..a1495a617fb 100644
---
a/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java
+++
b/pulsar-testclient/src/main/java/org/apache/pulsar/testclient/PerformanceTransaction.java
@@ -195,12 +195,12 @@ public class PerformanceTransaction {
} catch (ParameterException e) {
System.out.println(e.getMessage());
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
if (arguments.help) {
jc.usage();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
arguments.fillArgumentsFromProperties();
@@ -235,7 +235,7 @@ public class PerformanceTransaction {
log.error(
"Topic {} already exists but it has a
wrong number of partitions: {}, expecting {}",
topic,
partitionedTopicMetadata.partitions, arguments.partitions);
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
}
}
@@ -292,7 +292,7 @@ public class PerformanceTransaction {
} catch (Exception e) {
log.error("Failed to build Producer/Consumer with
exception : ", e);
executorService.shutdownNow();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
//The while loop has no break, and finally ends the
execution through the shutdownNow of
//the executorService
@@ -330,7 +330,7 @@ public class PerformanceTransaction {
} catch (PulsarClientException e) {
log.error("Receive message
failed", e);
executorService.shutdownNow();
- PerfClientUtils.exit(-1);
+ PerfClientUtils.exit(1);
}
long receiveTime = System.nanoTime();
if (!arguments.isDisableTransaction) {
diff --git
a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java
b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java
index 8bb56cb12c3..6c60cbd90f8 100644
---
a/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java
+++
b/pulsar-testclient/src/test/java/org/apache/pulsar/testclient/PerformanceBaseArgumentsTest.java
@@ -144,10 +144,7 @@ public class PerformanceBaseArgumentsTest {
args.confFile = "./src/test/resources/performance_client3.conf";
PerfClientUtils.setExitProcedure(code -> {
calledVar2.set(true);
- Assert.assertNotNull(code);
- if (code != -1) {
- fail("Incorrect exit code");
- }
+ Assert.assertEquals(code, 1, "Incorrect exit code");
});
args.confFile = "./src/test/resources/performance_client3.conf";
