This is an automated email from the ASF dual-hosted git repository. penghui pushed a commit to branch branch-2.8 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 9ce29f69c0e2367764d6179571d96659acfca375 Author: Ruguo Yu <[email protected]> AuthorDate: Tue Sep 7 15:55:17 2021 +0800 [testclient] deprecate option --subscriber-name and substitute --subscriptions first element for it (#11828) (cherry picked from commit 981cb626e59267e38c3b29faa02c14f0848a530f) --- .../java/org/apache/pulsar/testclient/PerformanceConsumer.java | 7 +++++-- site2/docs/reference-cli-tools.md | 2 +- 2 files changed, 6 insertions(+), 3 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 index c755cc0..4045a27 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 @@ -91,8 +91,8 @@ public class PerformanceConsumer { @Parameter(names = { "-ns", "--num-subscriptions" }, description = "Number of subscriptions (per topic)") public int numSubscriptions = 1; - @Parameter(names = { "-s", "--subscriber-name" }, description = "Subscriber name prefix") - public String subscriberName = "sub"; + @Parameter(names = { "-s", "--subscriber-name" }, description = "Subscriber name prefix", hidden = true) + public String subscriberName; @Parameter(names = { "-ss", "--subscriptions" }, description = "A list of subscriptions to consume on (e.g. sub1,sub2)") public List<String> subscriptions = Collections.singletonList("sub"); @@ -228,6 +228,9 @@ public class PerformanceConsumer { arguments.subscriptions.size() != arguments.numConsumers) { // keep compatibility with the previous version if (arguments.subscriptions.size() == 1) { + if (arguments.subscriberName == null) { + arguments.subscriberName = arguments.subscriptions.get(0); + } List<String> defaultSubscriptions = Lists.newArrayList(); for (int i = 0; i < arguments.numSubscriptions; i++) { defaultSubscriptions.add(String.format("%s-%d", arguments.subscriberName, i)); diff --git a/site2/docs/reference-cli-tools.md b/site2/docs/reference-cli-tools.md index cb35fe7..04b323a 100644 --- a/site2/docs/reference-cli-tools.md +++ b/site2/docs/reference-cli-tools.md @@ -443,7 +443,7 @@ Options |`-q`, `--receiver-queue-size`|Size of the receiver queue|1000| |`-u`, `--service-url`|Pulsar service URL|| |`-i`, `--stats-interval-seconds`|Statistics interval seconds. If 0, statistics will be disabled|0| -|`-s`, `--subscriber-name`|Subscriber name prefix|sub| +|`-s`, `--subscriber-name`|Subscriber name prefix|| |`-ss`, `--subscriptions`|A list of subscriptions to consume on (e.g. sub1,sub2)|sub| |`-st`, `--subscription-type`|Subscriber type. Possible values are Exclusive, Shared, Failover, Key_Shared.|Exclusive| |`-sp`, `--subscription-position`|Subscriber position. Possible values are Latest, Earliest.|Latest|
