修复CI问题

sermant-io · Nov 7, 2024 · 18a1251 · 18a1251
1 parent 6f87b6f
commit 18a1251
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 15 deletions.
diff --git a/...ant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/pom.xml b/...ant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/pom.xml
@@ -46,4 +46,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/...src/main/java/io/sermant/demo/grayscale/rocketmq/consumer/RocketMqConsumerController.java b/...src/main/java/io/sermant/demo/grayscale/rocketmq/consumer/RocketMqConsumerController.java
@@ -55,6 +55,10 @@ public class RocketMqConsumerController {
     @Value("${rocketmq.topic}")
     private String topic;
 
+    private final int maxReconsumeTimes = 10000;
+
+    private final int maxNums = 32;
+
     /**
      * clear cache count info
      *
@@ -77,20 +81,18 @@ public Map<String, Object> getMessageCount() {
             if (pullConsumer == null) {
                 pullConsumer = new DefaultMQPullConsumer("default");
                 pullConsumer.setNamesrvAddr(nameServer);
-                int maxReconsumeTimes = 10000;
                 pullConsumer.setMaxReconsumeTimes(maxReconsumeTimes);
                 pullConsumer.start();
             }
             Set<MessageQueue> messageQueues = pullConsumer.fetchSubscribeMessageQueues(topic);
             if (messageQueues.isEmpty()) {
                 return new HashMap<>();
             }
-            int maxNums = 32;
             for (MessageQueue mq : messageQueues) {
                 PullResultExt pullResult = (PullResultExt) pullConsumer.pullBlockIfNotFound(mq, null,
                         getMessageQueueOffSet(mq), maxNums);
                 putMessageQueueOffSet(mq, pullResult);
-                if (PullStatus.FOUND == pullResult.getPullStatus()) {
+                if (pullResult.getPullStatus() == PullStatus.FOUND) {
                     List<MessageExt> messageExts = pullResult.getMsgFoundList();
                     for (MessageExt messageExt: messageExts) {
                         RocketMqMessageUtils.convertMessageCount(messageExt);

diff --git a/...-demo/src/main/java/io/sermant/demo/grayscale/rocketmq/consumer/RocketMqMessageUtils.java b/...-demo/src/main/java/io/sermant/demo/grayscale/rocketmq/consumer/RocketMqMessageUtils.java
@@ -37,6 +37,11 @@ public class RocketMqMessageUtils {
     private RocketMqMessageUtils() {
     }
 
+    /**
+     * convert base/gray message
+     *
+     * @param messageExt MessageExt
+     */
     public static void convertMessageCount(MessageExt messageExt) {
         if (messageExt.getProperties() != null && GRAY.equals(messageExt.getProperties().get(
                 "x_lane_canary"))) {

diff --git a/...-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/pom.xml b/...-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/pom.xml
@@ -37,4 +37,4 @@
         </dependency>
     </dependencies>
 
-</project>
+</project>
diff --git a/...ant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/pom.xml b/...ant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/pom.xml
@@ -46,4 +46,4 @@
         </plugins>
     </build>
 
-</project>
+</project>
diff --git a/...-demo/src/main/java/io/sermant/demo/grayscale/rocketmq/producer/MqProducerController.java b/...-demo/src/main/java/io/sermant/demo/grayscale/rocketmq/producer/MqProducerController.java
@@ -48,17 +48,18 @@ public class MqProducerController {
 
     private DefaultMQProducer defaultMqProducer;
 
-  /**
-   * producer message
-   *
-   * @param message message
-   * @return is success
-   */
-  @GetMapping("/producerMessage")
+    private final int sendMsgTimeout = 60000;
+
+    /**
+     * producer message
+     *
+     * @param message message
+     * @return is success
+     */
+    @GetMapping("/producerMessage")
     public String producerMessage(@RequestParam("message") String message) {
         try {
             if (defaultMqProducer == null) {
-                int sendMsgTimeout = 60000;
                 defaultMqProducer = new DefaultMQProducer("default");
                 defaultMqProducer.setNamesrvAddr(mqAddress);
                 defaultMqProducer.setSendMsgTimeout(sendMsgTimeout);

diff --git a/sermant-integration-tests/mq-grayscale-rocketmq-test/pom.xml b/sermant-integration-tests/mq-grayscale-rocketmq-test/pom.xml
@@ -58,4 +58,4 @@
         <module>grayscale-rocketmq-consumer-demo</module>
     </modules>
 
-</project>
+</project>