调整睡眠时间

sermant-io · Feb 6, 2025 · 5783441 · 5783441
1 parent de2e635
commit 5783441
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 36 deletions.
diff --git a/.github/workflows/message_gray_integration_test.yml b/.github/workflows/message_gray_integration_test.yml
@@ -119,7 +119,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-auto-only-base:
-    name: Test for pull base only for auto rule
+    name: Test base only for auto rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -140,7 +140,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-auto-exc-only-base:
-    name: Test for pull base only for auto exclude rule
+    name: Test base only for auto exclude rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -161,7 +161,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-auto-base-gray:
-    name: Test for pull base gray for auto rule
+    name: Test pull base gray for auto rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -182,7 +182,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-auto-base-gray-lite:
-    name: Test for pull base gray for auto rule
+    name: Test lite pull base gray for auto rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -203,7 +203,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-auto-base-gray-push:
-    name: Test for pull base gray for auto rule
+    name: Test push base gray for auto rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -224,7 +224,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-auto-exc-base-gray:
-    name: Test for pull base gray for auto exclude rule
+    name: Test base gray for auto exclude rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -245,7 +245,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-base-only-base:
-    name: Test for pull base only for base rule
+    name: Test base only for base rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -266,7 +266,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-base-exc-only-base:
-    name: Test for pull base only for base exclude rule
+    name: Test base only for base exclude rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -287,7 +287,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-base-base-gray:
-    name: Test for pull base gray for base rule
+    name: Test base gray for base rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
@@ -308,7 +308,7 @@ jobs:
       - name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
         uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
   test-for-base-exc-base-gray:
-    name: Test for pull base gray for base exclude rule
+    name: Test base gray for base exclude rule
     runs-on: ubuntu-latest
     if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
     needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]

diff --git a/...t/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java b/...t/src/test/java/io/sermant/demo/grayscale/rocketmq/integration/GrayscaleRocketmqTest.java
@@ -59,7 +59,7 @@ public void testPluginEnabledFalseConsumeMessage() throws InterruptedException {
 
     private void testPluginEnabledFalsePull() throws InterruptedException {
         initAndProduceMessage(false, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String baseResult = getPullBaseResult();
         int baseBaseCount = parseBaseMessageCount(baseResult);
         int baseGrayCount = parseGrayMessageCount(baseResult);
@@ -100,15 +100,15 @@ private int parseGrayMessageCount(String messageCount) {
     public void testAutoOnlyBaseConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("AUTO", "");
         testAutoOnlyBasePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoOnlyBaseLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoOnlyBasePush();
     }
 
     private void testAutoOnlyBasePull() throws InterruptedException {
         initAndProduceMessage(false, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String baseResult = getPullBaseResult();
         int baseBaseCount = parseBaseMessageCount(baseResult);
         int baseGrayCount = parseGrayMessageCount(baseResult);
@@ -141,15 +141,15 @@ private void testAutoOnlyBasePush() throws InterruptedException {
     public void testAutoExcOnlyBaseConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("AUTO", "gray");
         testAutoExcOnlyBasePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoExcOnlyBaseLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoExcOnlyBasePush();
     }
 
     private void testAutoExcOnlyBasePull() throws InterruptedException {
         initAndProduceMessage(false, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String baseResult = getPullBaseResult();
         int baseBaseCount = parseBaseMessageCount(baseResult);
         int baseGrayCount = parseGrayMessageCount(baseResult);
@@ -182,9 +182,9 @@ private void testAutoExcOnlyBasePush() throws InterruptedException {
     public void testAutoBaseGrayConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("AUTO", "");
         testAutoBaseGrayPull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoBaseGrayLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoBaseGrayPush();
     }
 
@@ -193,7 +193,7 @@ public void testAutoBaseGrayConsumeMessage() throws InterruptedException {
     public void testAutoBaseGrayPull() throws InterruptedException {
         createGrayscaleConfig("AUTO", "");
         initAndProduceMessage(true, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String grayResult = getPullGrayResult();
         int grayGrayCount = parseGrayMessageCount(grayResult);
         String baseResult = getPullBaseResult();
@@ -236,15 +236,15 @@ public void testAutoBaseGrayPush() throws InterruptedException {
     public void testAutoExcBaseGrayConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("AUTO", "gray");
         testAutoExcBaseGrayPull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoExcBaseGrayLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testAutoExcBaseGrayPush();
     }
 
     private void testAutoExcBaseGrayPull() throws InterruptedException {
         initAndProduceMessage(true, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String grayResult = getPullGrayResult();
         int grayBaseCount = parseBaseMessageCount(grayResult);
         int grayGrayCount = parseGrayMessageCount(grayResult);
@@ -286,15 +286,15 @@ private void testAutoExcBaseGrayPush() throws InterruptedException {
     public void testBaseOnlyBaseConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("BASE", "");
         testBaseOnlyBasePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseOnlyBaseLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseOnlyBasePush();
     }
 
     private void testBaseOnlyBasePull() throws InterruptedException {
         initAndProduceMessage(false, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String baseResult = getPullBaseResult();
         int baseBaseCount = parseBaseMessageCount(baseResult);
         int baseGrayCount = parseGrayMessageCount(baseResult);
@@ -327,15 +327,15 @@ private void testBaseOnlyBasePush() throws InterruptedException {
     public void testBaseExcOnlyBaseConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("BASE", "gray");
         testBaseExcOnlyBasePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseExcOnlyBaseLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseExcOnlyBasePush();
     }
 
     private void testBaseExcOnlyBasePull() throws InterruptedException {
         initAndProduceMessage(false, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String baseResult = getPullBaseResult();
         int baseBaseCount = parseBaseMessageCount(baseResult);
         int baseGrayCount = parseGrayMessageCount(baseResult);
@@ -368,15 +368,15 @@ private void testBaseExcOnlyBasePush() throws InterruptedException {
     public void testBaseBaseGrayConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("BASE", "");
         testBaseBaseGrayPull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseBaseGrayLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseBaseGrayPush();
     }
 
     private void testBaseBaseGrayPull() throws InterruptedException {
         initAndProduceMessage(true, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String baseResult = getPullBaseResult();
         int baseBaseCount = parseBaseMessageCount(baseResult);
         int baseGrayCount = parseGrayMessageCount(baseResult);
@@ -418,15 +418,15 @@ private void testBaseBaseGrayPush() throws InterruptedException {
     public void testBaseExcBaseGrayConsumeMessage() throws InterruptedException {
         createGrayscaleConfig("BASE", "gray");
         testBaseExcBaseGrayPull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseExcBaseGrayLitePull();
-        Thread.sleep(10000);
+        Thread.sleep(15000);
         testBaseExcBaseGrayPush();
     }
 
     private void testBaseExcBaseGrayPull() throws InterruptedException {
         initAndProduceMessage(true, CONSUMER_TYPE_PULL);
-        Thread.sleep(150000);
+        Thread.sleep(240000);
         String baseResult = getPullBaseResult();
         int baseBaseCount = parseBaseMessageCount(baseResult);
         int baseGrayCount = parseGrayMessageCount(baseResult);
@@ -472,7 +472,7 @@ private void initAndProduceMessage(boolean isGrayInstanceInit, String consumerTy
             // Trigger start gray consumer.
             restTemplate.getForObject("http://127.0.0.1:9010/initConsumer?consumerType={1}", String.class,
                     consumerType);
-            Thread.sleep(50000);
+            Thread.sleep(150000);
         }
 
         // Trigger start base consumer.