This is an automated email from the ASF dual-hosted git repository.
mmerli 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 1c7b12d [Issue 4106] [pulsar-testclient] Improve usage hints for
pulsar-perf subcommands (#4107)
1c7b12d is described below
commit 1c7b12d379cf36183d60919dcaff75e4d6cf63f2
Author: Fangbin Sun <[email protected]>
AuthorDate: Wed Apr 24 12:37:25 2019 +0800
[Issue 4106] [pulsar-testclient] Improve usage hints for pulsar-perf
subcommands (#4107)
* Improve usage hints for pulsar-perf subcommands.
* Change word prop to tenant
---
.../proxy/socket/client/PerformanceClient.java | 6 +++---
.../apache/pulsar/testclient/BrokerMonitor.java | 24 ++++++++++++++--------
.../pulsar/testclient/LoadSimulationClient.java | 4 +++-
.../testclient/LoadSimulationController.java | 8 ++++++--
.../pulsar/testclient/ManagedLedgerWriter.java | 4 ++--
.../pulsar/testclient/PerformanceConsumer.java | 2 +-
.../pulsar/testclient/PerformanceProducer.java | 2 +-
.../pulsar/testclient/PerformanceReader.java | 2 +-
8 files changed, 33 insertions(+), 19 deletions(-)
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 f94f1b4..531918e 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
@@ -74,7 +74,7 @@ public class PerformanceClient {
@Parameter(names = { "-u", "--proxy-url" }, description = "Pulsar
Proxy URL, e.g., \"ws://localhost:8080/\"", required = true)
public String proxyURL;
- @Parameter(description = "/persistent/my-property/my-ns/my-topic",
required = true)
+ @Parameter(description = "persistent://tenant/ns/my-topic", required =
true)
public List<String> topics;
@Parameter(names = { "-r", "--rate" }, description = "Publish rate
msg/s across topics")
@@ -111,12 +111,12 @@ public class PerformanceClient {
public Arguments loadArguments(String[] args) {
Arguments arguments = new Arguments();
jc = new JCommander(arguments);
- jc.setProgramName("pulsar-perf-websocket-producer");
+ jc.setProgramName("pulsar-perf websocket-producer");
try {
jc.parse(args);
} catch (ParameterException e) {
- log.error(e.getMessage());
+ System.out.println(e.getMessage());
jc.usage();
System.exit(-1);
}
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 6978e30..11fd88e 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
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import com.beust.jcommander.ParameterException;
import org.apache.pulsar.broker.TimeAverageBrokerData;
import org.apache.pulsar.broker.loadbalance.impl.ModularLoadManagerImpl;
import org.apache.pulsar.policies.data.loadbalancer.LoadReport;
@@ -428,6 +429,9 @@ public class BrokerMonitor {
// JCommander arguments class.
private static class Arguments {
+ @Parameter(names = { "-h", "--help" }, description = "Help message",
help = true)
+ boolean help;
+
@Parameter(names = { "--connect-string" }, description = "Zookeeper
connect string", required = true)
public String connectString = null;
}
@@ -465,16 +469,20 @@ public class BrokerMonitor {
* @param args
* Arguments for the monitor.
*/
- public static void main(String[] args) {
+ public static void main(String[] args) throws Exception {
+ final Arguments arguments = new Arguments();
+ final JCommander jc = new JCommander(arguments);
+ jc.setProgramName("pulsar-perf monitor-brokers");
+
try {
- final Arguments arguments = new Arguments();
- final JCommander jc = new JCommander(arguments);
jc.parse(args);
- final ZooKeeper zkClient = new ZooKeeper(arguments.connectString,
ZOOKEEPER_TIMEOUT_MILLIS, null);
- final BrokerMonitor monitor = new BrokerMonitor(zkClient);
- monitor.start();
- } catch (Exception ex) {
- throw new RuntimeException(ex);
+ } catch (ParameterException e) {
+ System.out.println(e.getMessage());
+ jc.usage();
+ System.exit(-1);
}
+ final ZooKeeper zkClient = new ZooKeeper(arguments.connectString,
ZOOKEEPER_TIMEOUT_MILLIS, null);
+ final BrokerMonitor monitor = new BrokerMonitor(zkClient);
+ monitor.start();
}
}
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 e9b25da..9346da7 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
@@ -336,11 +336,13 @@ public class LoadSimulationClient {
public static void main(String[] args) throws Exception {
final MainArguments mainArguments = new MainArguments();
final JCommander jc = new JCommander(mainArguments);
+ jc.setProgramName("pulsar-perf simulation-client");
try {
jc.parse(args);
} catch (ParameterException e) {
+ System.out.println(e.getMessage());
jc.usage();
- throw e;
+ System.exit(-1);
}
(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 77805ce..86c1408 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
@@ -85,6 +85,9 @@ public class LoadSimulationController {
// JCommander arguments for starting a controller via main.
private static class MainArguments {
+ @Parameter(names = { "-h", "--help" }, description = "Help message",
help = true)
+ boolean help;
+
@Parameter(names = { "--cluster" }, description = "Cluster to test
on", required = true)
String cluster;
@@ -711,12 +714,13 @@ public class LoadSimulationController {
public static void main(String[] args) throws Exception {
final MainArguments arguments = new MainArguments();
final JCommander jc = new JCommander(arguments);
+ jc.setProgramName("pulsar-perf simulation-controller");
try {
jc.parse(args);
} catch (Exception ex) {
+ System.out.println(ex.getMessage());
jc.usage();
- ex.printStackTrace();
- System.exit(1);
+ System.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 08626a8..d75ba0a 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
@@ -93,7 +93,7 @@ public class ManagedLedgerWriter {
@Parameter(names = { "--threads" }, description = "Number of threads
writing")
public int numThreads = 1;
- @Parameter(names = { "-zk", "--zookeeperServers" }, description =
"ZooKeeper connection string")
+ @Parameter(names = { "-zk", "--zookeeperServers" }, description =
"ZooKeeper connection string", required = true)
public String zookeeperServers;
@Parameter(names = { "-o", "--max-outstanding" }, description = "Max
number of outstanding requests")
@@ -129,7 +129,7 @@ public class ManagedLedgerWriter {
final Arguments arguments = new Arguments();
JCommander jc = new JCommander(arguments);
- jc.setProgramName("pulsar-perf-producer");
+ jc.setProgramName("pulsar-perf managed-ledger");
try {
jc.parse(args);
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 c201c71..7346922 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
@@ -131,7 +131,7 @@ public class PerformanceConsumer {
public static void main(String[] args) throws Exception {
final Arguments arguments = new Arguments();
JCommander jc = new JCommander(arguments);
- jc.setProgramName("pulsar-perf-consumer");
+ jc.setProgramName("pulsar-perf consume");
try {
jc.parse(args);
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 440ebf7..1107ebd 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
@@ -159,7 +159,7 @@ public class PerformanceProducer {
final Arguments arguments = new Arguments();
JCommander jc = new JCommander(arguments);
- jc.setProgramName("pulsar-perf-producer");
+ jc.setProgramName("pulsar-perf produce");
try {
jc.parse(args);
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 dd5307c..73db7d7 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
@@ -111,7 +111,7 @@ public class PerformanceReader {
public static void main(String[] args) throws Exception {
final Arguments arguments = new Arguments();
JCommander jc = new JCommander(arguments);
- jc.setProgramName("pulsar-perf-reader");
+ jc.setProgramName("pulsar-perf read");
try {
jc.parse(args);
