This is an automated email from the ASF dual-hosted git repository.
jinrongtong pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/rocketmq.git
The following commit(s) were added to refs/heads/develop by this push:
new dad6b4dadf [ISSUE #7334] `registerIncrementBrokerData` for single
topic update (#7335)
dad6b4dadf is described below
commit dad6b4dadfec7a58e78a6715ec16c2eb6b17ff27
Author: Ziyi Tan <[email protected]>
AuthorDate: Mon Sep 11 14:34:10 2023 +0800
[ISSUE #7334] `registerIncrementBrokerData` for single topic update (#7335)
Signed-off-by: Ziy1-Tan <[email protected]>
---
.../rocketmq/broker/topic/TopicConfigManager.java | 30 ++++++++++++++++++----
1 file changed, 25 insertions(+), 5 deletions(-)
diff --git
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
index 4e3c1736c4..754605438d 100644
---
a/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
+++
b/broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
@@ -290,7 +290,11 @@ public class TopicConfigManager extends ConfigManager {
}
if (createNew) {
- this.brokerController.registerBrokerAll(false, true, true);
+ if
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+ this.brokerController.registerSingleTopicAll(topicConfig);
+ } else {
+ this.brokerController.registerIncrementBrokerData(topicConfig,
dataVersion);
+ }
}
return topicConfig;
@@ -394,7 +398,11 @@ public class TopicConfigManager extends ConfigManager {
}
if (createNew) {
- this.brokerController.registerBrokerAll(false, true, true);
+ if
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+ this.brokerController.registerSingleTopicAll(topicConfig);
+ } else {
+ this.brokerController.registerIncrementBrokerData(topicConfig,
dataVersion);
+ }
}
return topicConfig;
@@ -435,7 +443,11 @@ public class TopicConfigManager extends ConfigManager {
}
if (createNew) {
- this.brokerController.registerBrokerAll(false, true, true);
+ if
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+ this.brokerController.registerSingleTopicAll(topicConfig);
+ } else {
+ this.brokerController.registerIncrementBrokerData(topicConfig,
dataVersion);
+ }
}
return topicConfig;
@@ -461,7 +473,11 @@ public class TopicConfigManager extends ConfigManager {
dataVersion.nextVersion(stateMachineVersion);
this.persist();
- this.brokerController.registerBrokerAll(false, true, true);
+ if
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+ this.brokerController.registerSingleTopicAll(topicConfig);
+ } else {
+ this.brokerController.registerIncrementBrokerData(topicConfig,
dataVersion);
+ }
}
}
@@ -484,7 +500,11 @@ public class TopicConfigManager extends ConfigManager {
dataVersion.nextVersion(stateMachineVersion);
this.persist();
- this.brokerController.registerBrokerAll(false, true, true);
+ if
(brokerController.getBrokerConfig().isEnableSingleTopicRegister()) {
+ this.brokerController.registerSingleTopicAll(topicConfig);
+ } else {
+ this.brokerController.registerIncrementBrokerData(topicConfig,
dataVersion);
+ }
}
}