Merge pull request #10079 from qzhuyan/fix/william/i18n-broker_shared…

…_subscription_strategy fix: i18n desc of broker_shared_subscription_strategy
emqx · Mar 7, 2023 · 158b4a9 · 158b4a9
2 parents 609cd01 + 1912027
commit 158b4a9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/apps/emqx/i18n/emqx_schema_i18n.conf b/apps/emqx/i18n/emqx_schema_i18n.conf
@@ -1070,14 +1070,20 @@ Supported configurations are the following:
             en: """Dispatch strategy for shared subscription.
   - `random`: dispatch the message to a random selected subscriber
   - `round_robin`: select the subscribers in a round-robin manner
+  - `round_robin_per_group`: select the subscribers in round-robin fashion within each shared subscriber group
+  - `local`: select random local subscriber otherwise select random cluster-wide
   - `sticky`: always use the last selected subscriber to dispatch, until the subscriber disconnects.
-  - `hash`: select the subscribers by the hash of `clientIds`"""
+  - `hash_clientid`: select the subscribers by hashing the `clientIds`
+  - `hash_topic`: select the subscribers by hashing the source topic"""
 
             zh: """共享订阅消息派发策略。
   - `random`：随机挑选一个共享订阅者派发；
   - `round_robin`：使用 round-robin 策略派发；
+  - `round_robin_per_group`: 在共享组内循环选择下一个成员；
+  - `local`: 选择随机的本地成员，否则选择随机的集群范围内成员;
   - `sticky`：总是使用上次选中的订阅者派发，直到它断开连接；
-  - `hash`：使用发送者的 Client ID 进行 Hash 来选择订阅者。"""
+  - `hash_clientid`：使用发送者的 Client ID 进行 Hash 来选择订阅者;
+  - `hash_topic`: 使用源主题进行 Hash 来选择订阅者。"""
         }
     }
 

diff --git a/changes/ce/fix-10079.en.md b/changes/ce/fix-10079.en.md
@@ -0,0 +1 @@
+Fix description of `shared_subscription_strategy`. 
diff --git a/changes/ce/fix-10079.zh.md b/changes/ce/fix-10079.zh.md
@@ -0,0 +1,2 @@
+修正对 `shared_subscription_strategy` 的描述。
+