[ISSUE #6686] Remove ClientManageProcessor#heartBeat repeat judgment (#6687)

This commit is contained in:
mxsm
2023-05-04 09:33:30 +08:00
committed by GitHub
parent 7903c70412
commit b4e6acca32
@@ -99,38 +99,37 @@ public class ClientManageProcessor implements NettyRequestProcessor {
}
}
SubscriptionGroupConfig subscriptionGroupConfig =
this.brokerController.getSubscriptionGroupManager().findSubscriptionGroupConfig(
consumerData.getGroupName());
SubscriptionGroupConfig subscriptionGroupConfig = this.brokerController.getSubscriptionGroupManager()
.findSubscriptionGroupConfig(consumerData.getGroupName());
boolean isNotifyConsumerIdsChangedEnable = true;
if (null != subscriptionGroupConfig) {
isNotifyConsumerIdsChangedEnable = subscriptionGroupConfig.isNotifyConsumerIdsChangedEnable();
int topicSysFlag = 0;
if (consumerData.isUnitMode()) {
topicSysFlag = TopicSysFlag.buildSysFlag(false, true);
}
String newTopic = MixAll.getRetryTopic(consumerData.getGroupName());
this.brokerController.getTopicConfigManager().createTopicInSendMessageBackMethod(
newTopic,
subscriptionGroupConfig.getRetryQueueNums(),
PermName.PERM_WRITE | PermName.PERM_READ, hasOrderTopicSub, topicSysFlag);
if (null == subscriptionGroupConfig) {
continue;
}
if (null != subscriptionGroupConfig) {
boolean changed = this.brokerController.getConsumerManager().registerConsumer(
consumerData.getGroupName(),
clientChannelInfo,
consumerData.getConsumeType(),
consumerData.getMessageModel(),
consumerData.getConsumeFromWhere(),
consumerData.getSubscriptionDataSet(),
isNotifyConsumerIdsChangedEnable
);
if (changed) {
LOGGER.info(
"ClientManageProcessor: registerConsumer info changed, SDK address={}, consumerData={}",
RemotingHelper.parseChannelRemoteAddr(ctx.channel()), consumerData.toString());
}
isNotifyConsumerIdsChangedEnable = subscriptionGroupConfig.isNotifyConsumerIdsChangedEnable();
int topicSysFlag = 0;
if (consumerData.isUnitMode()) {
topicSysFlag = TopicSysFlag.buildSysFlag(false, true);
}
String newTopic = MixAll.getRetryTopic(consumerData.getGroupName());
this.brokerController.getTopicConfigManager().createTopicInSendMessageBackMethod(newTopic, subscriptionGroupConfig.getRetryQueueNums(),
PermName.PERM_WRITE | PermName.PERM_READ, hasOrderTopicSub, topicSysFlag);
boolean changed = this.brokerController.getConsumerManager().registerConsumer(
consumerData.getGroupName(),
clientChannelInfo,
consumerData.getConsumeType(),
consumerData.getMessageModel(),
consumerData.getConsumeFromWhere(),
consumerData.getSubscriptionDataSet(),
isNotifyConsumerIdsChangedEnable
);
if (changed) {
LOGGER.info("ClientManageProcessor: registerConsumer info changed, SDK address={}, consumerData={}",
RemotingHelper.parseChannelRemoteAddr(ctx.channel()), consumerData.toString());
}
}
for (ProducerData data : heartbeatData.getProducerDataSet()) {