[improve][cli] pulsar-perf: check for invalid CLI options (apache#18889)

lifepuzzlefun · Jan 10, 2023 · 6761520 · 6761520
1 parent 6258eb3
commit 6761520
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 0 deletions.
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
@@ -223,6 +223,15 @@ public static void main(String[] args) throws Exception {
             arguments.authPluginClassName = arguments.deprecatedAuthPluginClassName;
         }
 
+        for (String arg : arguments.topic) {
+            if (arg.startsWith("-")) {
+                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);
+            }
+        }
+
         if (arguments.topic != null && arguments.topic.size() != arguments.numTopics) {
             // keep compatibility with the previous version
             if (arguments.topic.size() == 1) {

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
@@ -292,6 +292,15 @@ public static void main(String[] args) throws Exception {
             arguments.authPluginClassName = arguments.deprecatedAuthPluginClassName;
         }
 
+        for (String arg : arguments.topics) {
+            if (arg.startsWith("-")) {
+                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);
+            }
+        }
+
         if (arguments.topics != null && arguments.topics.size() != arguments.numTopics) {
             // keep compatibility with the previous version
             if (arguments.topics.size() == 1) {

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
@@ -122,6 +122,15 @@ public static void main(String[] args) throws Exception {
             PerfClientUtils.exit(-1);
         }
 
+        for (String arg : arguments.topic) {
+            if (arg.startsWith("-")) {
+                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);
+            }
+        }
+
         if (arguments.topic != null && arguments.topic.size() != arguments.numTopics) {
             // keep compatibility with the previous version
             if (arguments.topic.size() == 1) {