修改同步更新tags方法名称

sermant-io · Sep 14, 2024 · 66bb408 · 66bb408
1 parent 0673593
commit 66bb408
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/sermant-plugins/sermant-mq-grayscale/mq-config-common/pom.xml b/sermant-plugins/sermant-mq-grayscale/mq-config-common/pom.xml
@@ -10,6 +10,7 @@
     </parent>
 
     <artifactId>mq-config-common</artifactId>
+    <packaging>jar</packaging>
 
     <properties>
         <maven.compiler.source>8</maven.compiler.source>

diff --git a/.../mq/grayscale/rocketmq/interceptor/RocketMqPullConsumerSubscriptionUpdateInterceptor.java b/.../mq/grayscale/rocketmq/interceptor/RocketMqPullConsumerSubscriptionUpdateInterceptor.java
@@ -65,9 +65,9 @@ private void buildSql92SubscriptionData(ExecuteContext context, SubscriptionData
         String consumerGroup = pullConsumer.getConsumerGroup();
         if (StringUtils.isEmpty(RocketMqGrayscaleConfigUtils.getGrayGroupTag())) {
             RocketMqConsumerGroupAutoCheck.setMqClientInstance(subscriptionData.getTopic(), consumerGroup, instance);
+            RocketMqConsumerGroupAutoCheck.syncUpdateCacheGrayTags();
+            RocketMqConsumerGroupAutoCheck.startSchedulerCheckGroupTask();
         }
-        RocketMqConsumerGroupAutoCheck.syncCheckGrayConsumerGroup();
-        RocketMqConsumerGroupAutoCheck.startSchedulerCheckGroupTask();
         String namesrvAddr = instance.getClientConfig().getNamesrvAddr();
         String subscribeScope = RocketMqSubscriptionDataUtils.buildSubscribeScope(subscriptionData.getTopic(),
                 consumerGroup, namesrvAddr);

diff --git a/...nt/mq/grayscale/rocketmq/interceptor/RocketMqSchedulerRebuildSubscriptionInterceptor.java b/...nt/mq/grayscale/rocketmq/interceptor/RocketMqSchedulerRebuildSubscriptionInterceptor.java
@@ -63,9 +63,9 @@ private void buildSql92SubscriptionData(SubscriptionData subscriptionData, Rebal
             MQClientInstance instance = balance.getmQClientFactory();
             if (StringUtils.isEmpty(RocketMqGrayscaleConfigUtils.getGrayGroupTag())) {
                 RocketMqConsumerGroupAutoCheck.setMqClientInstance(topic, consumerGroup, instance);
+                RocketMqConsumerGroupAutoCheck.syncUpdateCacheGrayTags();
+                RocketMqConsumerGroupAutoCheck.startSchedulerCheckGroupTask();
             }
-            RocketMqConsumerGroupAutoCheck.syncCheckGrayConsumerGroup();
-            RocketMqConsumerGroupAutoCheck.startSchedulerCheckGroupTask();
             String namesrvAddr = balance.getmQClientFactory().getClientConfig().getNamesrvAddr();
             resetsSql92SubscriptionData(topic, consumerGroup, subscriptionData, namesrvAddr);
 

diff --git a/...rc/main/java/io/sermant/mq/grayscale/rocketmq/service/RocketMqConsumerGroupAutoCheck.java b/...rc/main/java/io/sermant/mq/grayscale/rocketmq/service/RocketMqConsumerGroupAutoCheck.java
@@ -104,7 +104,7 @@ public static void setMqClientInstance(String topic, String consumerGroup, MQCli
     /**
      * sync check gray consumer group is running and update gray tags
      */
-    public static void syncCheckGrayConsumerGroup() {
+    public static void syncUpdateCacheGrayTags() {
         if (RocketMqGrayscaleConfigUtils.getConsumeType() == ConsumeModeEnum.AUTO && !START_AUTO_CHECK.get()) {
             // sync to obtain current gray consumer group at AUTO mode before start scheduler check group
             findGrayConsumerGroupAndUpdateGrayTags();