Skip to content

fix sync topic and group if attributes isn't null #9548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
1782935682 wants to merge 1 commit into from
Closed

fix sync topic and group if attributes isn't null #9548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions broker/src/main/java/org/apache/rocketmq/broker/subscription/SubscriptionGroupManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import org.apache.rocketmq.remoting.protocol.DataVersion;
import org.apache.rocketmq.remoting.protocol.RemotingSerializable;
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
import org.apache.rocketmq.store.config.BrokerRole;

public class SubscriptionGroupManager extends ConfigManager {
protected static final Logger log = LoggerFactory.getLogger(LoggerName.BROKER_LOGGER_NAME);
Expand Down Expand Up @@ -155,11 +156,14 @@ public void updateSubscriptionGroupConfigWithoutPersist(SubscriptionGroupConfig
Map<String, String> newAttributes = request(config);
Map<String, String> currentAttributes = current(config.getGroupName());

Map<String, String> finalAttributes = AttributeUtil.alterCurrentAttributes(
this.subscriptionGroupTable.get(config.getGroupName()) == null,
SubscriptionGroupAttributes.ALL,
ImmutableMap.copyOf(currentAttributes),
ImmutableMap.copyOf(newAttributes));
Map<String, String> finalAttributes = newAttributes;
if (this.brokerController.getMessageStoreConfig().getBrokerRole() != BrokerRole.SLAVE) {
finalAttributes = AttributeUtil.alterCurrentAttributes(
this.subscriptionGroupTable.get(config.getGroupName()) == null,
SubscriptionGroupAttributes.ALL,
ImmutableMap.copyOf(currentAttributes),
ImmutableMap.copyOf(newAttributes));
}

config.setAttributes(finalAttributes);

Expand Down
14 changes: 9 additions & 5 deletions broker/src/main/java/org/apache/rocketmq/broker/topic/TopicConfigManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
import org.apache.rocketmq.remoting.protocol.body.TopicConfigAndMappingSerializeWrapper;
import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
import org.apache.rocketmq.remoting.protocol.statictopic.TopicQueueMappingInfo;
import org.apache.rocketmq.store.config.BrokerRole;
import org.apache.rocketmq.store.timer.TimerMessageStore;
import org.apache.rocketmq.tieredstore.TieredMessageStore;
import org.apache.rocketmq.tieredstore.metadata.MetadataStore;
Expand Down Expand Up @@ -504,11 +505,14 @@ public void updateSingleTopicConfigWithoutPersist(final TopicConfig topicConfig)
Map<String, String> newAttributes = request(topicConfig);
Map<String, String> currentAttributes = current(topicConfig.getTopicName());

Map<String, String> finalAttributes = AttributeUtil.alterCurrentAttributes(
this.topicConfigTable.get(topicConfig.getTopicName()) == null,
TopicAttributes.ALL,
ImmutableMap.copyOf(currentAttributes),
ImmutableMap.copyOf(newAttributes));
Map<String, String> finalAttributes = newAttributes;
if (this.brokerController.getMessageStoreConfig().getBrokerRole() != BrokerRole.SLAVE) {
finalAttributes = AttributeUtil.alterCurrentAttributes(
this.topicConfigTable.get(topicConfig.getTopicName()) == null,
TopicAttributes.ALL,
ImmutableMap.copyOf(currentAttributes),
ImmutableMap.copyOf(newAttributes));
}

topicConfig.setAttributes(finalAttributes);
updateTieredStoreTopicMetadata(topicConfig, newAttributes);
Expand Down
2 changes: 2 additions & 0 deletions ...er/src/test/java/org/apache/rocketmq/broker/config/v2/SubscriptionGroupManagerV2Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ public void setUp() throws IOException {
File configStoreDir = tf.newFolder();
messageStoreConfig = new MessageStoreConfig();
messageStoreConfig.setStorePathRootDir(configStoreDir.getAbsolutePath());
Mockito.doReturn(messageStoreConfig).when(controller).getMessageStoreConfig();

configStorage = new ConfigStorage(messageStoreConfig);
configStorage.start();
subscriptionGroupManagerV2 = new SubscriptionGroupManagerV2(controller, configStorage);
Expand Down
Loading