From 3453161142d1603080722c4c592f472d8f99beb6 Mon Sep 17 00:00:00 2001 From: Anonymitaet Date: Mon, 24 Jan 2022 10:11:08 +0800 Subject: [PATCH 1/5] [Doc] add explanations for setting bookie rack name --- .../main/java/org/apache/pulsar/admin/cli/CmdBookies.java | 8 +++++++- site2/docs/administration-isolation.md | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java index c8b3363d08d41..0f9d99c66c011 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java @@ -85,7 +85,13 @@ private class UpdateBookie extends CliCommand { description = "Bookie address (format: `address:port`)", required = true) private String bookieAddress; - @Parameter(names = { "-r", "--rack" }, description = "Bookie rack name", required = true) + @Parameter(names = { "-r", "--rack" }, description = "Bookie rack name. " + + "If you set a bookie rack name to slash (/) " + + "or an empty string (""): " + + "if you use Pulsar earlier than 2.7.5, 2.8.3, and 2.9.2, " + + "an an exception is thrown; " + + "If you use Pulsar later than 2.7.5, 2.8.3, and 2.9.2, " + + "it falls back to /default-rack or /default-region/default-rack.", required = true) private String bookieRack; @Parameter(names = { "--hostname" }, description = "Bookie host name", required = false) diff --git a/site2/docs/administration-isolation.md b/site2/docs/administration-isolation.md index 7524e4dc9a482..319c6c1937201 100644 --- a/site2/docs/administration-isolation.md +++ b/site2/docs/administration-isolation.md @@ -73,6 +73,10 @@ bin/pulsar-admin namespaces set-bookie-affinity-group public/default \ --primary-group group-bookie1 ``` +> **Note** +> +> Do not set a bookie rack name to slash (`/`) or an empty string (`""`) if you use Pulsar earlier than 2.7.5, 2.8.3, and 2.9.2. For the bookie rack name restrictions, see [reference-cli-tools.md](#set-bookie-rack). + [POST /admin/v2/namespaces/{tenant}/{namespace}/persistence/bookieAffinity](https://pulsar.apache.org/admin-rest-api/?version=master&apiversion=v2#operation/setBookieAffinityGroup) From 58fd3e67284e43a1643727c2cabfea84fb218315 Mon Sep 17 00:00:00 2001 From: Anonymitaet Date: Mon, 24 Jan 2022 10:13:28 +0800 Subject: [PATCH 2/5] update --- site2/docs/administration-isolation.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site2/docs/administration-isolation.md b/site2/docs/administration-isolation.md index 319c6c1937201..dac9d2024d036 100644 --- a/site2/docs/administration-isolation.md +++ b/site2/docs/administration-isolation.md @@ -75,7 +75,7 @@ bin/pulsar-admin namespaces set-bookie-affinity-group public/default \ > **Note** > -> Do not set a bookie rack name to slash (`/`) or an empty string (`""`) if you use Pulsar earlier than 2.7.5, 2.8.3, and 2.9.2. For the bookie rack name restrictions, see [reference-cli-tools.md](#set-bookie-rack). +> Do not set a bookie rack name to slash (`/`) or an empty string (`""`) if you use Pulsar earlier than 2.7.5, 2.8.3, and 2.9.2. For the bookie rack name restrictions, see [pulsar-admin bookies set-bookie-rack](https://pulsar.apache.org/tools/pulsar-admin/). From 50339e39a6a26c4d51e507229395395327f41c51 Mon Sep 17 00:00:00 2001 From: Anonymitaet Date: Mon, 24 Jan 2022 11:10:26 +0800 Subject: [PATCH 3/5] update --- .../main/java/org/apache/pulsar/admin/cli/CmdBookies.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java index 0f9d99c66c011..3dd1f95bebe59 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java @@ -85,13 +85,13 @@ private class UpdateBookie extends CliCommand { description = "Bookie address (format: `address:port`)", required = true) private String bookieAddress; - @Parameter(names = { "-r", "--rack" }, description = "Bookie rack name. " + @Parameter(names = { "-r", "--rack" }, description = ("Bookie rack name. " + "If you set a bookie rack name to slash (/) " + "or an empty string (""): " + "if you use Pulsar earlier than 2.7.5, 2.8.3, and 2.9.2, " + "an an exception is thrown; " - + "If you use Pulsar later than 2.7.5, 2.8.3, and 2.9.2, " - + "it falls back to /default-rack or /default-region/default-rack.", required = true) + + "if you use Pulsar later than 2.7.5, 2.8.3, and 2.9.2, " + + "it falls back to /default-rack or /default-region/default-rack."), required = true) private String bookieRack; @Parameter(names = { "--hostname" }, description = "Bookie host name", required = false) From f1935fb1c1e02911b2dbfe098864591716d2e32c Mon Sep 17 00:00:00 2001 From: Anonymitaet Date: Mon, 24 Jan 2022 15:22:11 +0800 Subject: [PATCH 4/5] update --- .../src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java index 3dd1f95bebe59..25d4864f8b983 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java @@ -85,13 +85,13 @@ private class UpdateBookie extends CliCommand { description = "Bookie address (format: `address:port`)", required = true) private String bookieAddress; - @Parameter(names = { "-r", "--rack" }, description = ("Bookie rack name. " + @Parameter(names = { "-r", "--rack" }, description = "Bookie rack name. " + "If you set a bookie rack name to slash (/) " + "or an empty string (""): " + "if you use Pulsar earlier than 2.7.5, 2.8.3, and 2.9.2, " + "an an exception is thrown; " + "if you use Pulsar later than 2.7.5, 2.8.3, and 2.9.2, " - + "it falls back to /default-rack or /default-region/default-rack."), required = true) + + "it falls back to /default-rack or /default-region/default-rack.", required = true) private String bookieRack; @Parameter(names = { "--hostname" }, description = "Bookie host name", required = false) From a8e4124829a37cf70d582116a60b27b29e333943 Mon Sep 17 00:00:00 2001 From: Anonymitaet Date: Mon, 24 Jan 2022 15:52:06 +0800 Subject: [PATCH 5/5] update --- .../src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java index 25d4864f8b983..2f8354a135e34 100644 --- a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java +++ b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/CmdBookies.java @@ -87,7 +87,7 @@ private class UpdateBookie extends CliCommand { @Parameter(names = { "-r", "--rack" }, description = "Bookie rack name. " + "If you set a bookie rack name to slash (/) " - + "or an empty string (""): " + + "or an empty string (\"\"): " + "if you use Pulsar earlier than 2.7.5, 2.8.3, and 2.9.2, " + "an an exception is thrown; " + "if you use Pulsar later than 2.7.5, 2.8.3, and 2.9.2, "