upgrade fireman to 2.0.24 (#759)

* upgrade fireman to 2.0.24 * fix corrupted stdout in ci * fix ci fail --------- Co-authored-by: llj李龙姣 <[email protected]> Co-authored-by: lishanglin <[email protected]>
ctripcorp · Dec 21, 2023 · 352386f · 352386f
1 parent 0ef0151
commit 352386f
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -400,6 +400,10 @@
                         <groupId>ch.qos.logback</groupId>
                         <artifactId>logback-classic</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>ch.qos.logback</groupId>
+                        <artifactId>logback-core</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -940,7 +944,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.22.1</version>
+                    <version>2.22.2</version>
                 </plugin>
 
 

diff --git a/...ava/com/ctrip/xpipe/redis/console/keeper/impl/DefaultKeeperContainerUsedInfoAnalyzer.java b/...ava/com/ctrip/xpipe/redis/console/keeper/impl/DefaultKeeperContainerUsedInfoAnalyzer.java
@@ -115,12 +115,11 @@ private void removeExpireData(Date currentTime) {
         Iterator<Map.Entry<Date, Integer>> iterator = checkerIndexes.entrySet().iterator();
         while (iterator.hasNext()) {
             Map.Entry<Date, Integer> entry = iterator.next();
-            logger.warn("[removeExpireData] remove expire index:{} time:{}, expire time:{}", entry.getValue(), entry.getKey(), config.getKeeperCheckerIntervalMilli());
             if (currentTime.getTime() - entry.getKey().getTime() > config.getKeeperCheckerIntervalMilli()) {
+                logger.info("[removeExpireData] remove expire index:{} time:{}, expire time:{}", entry.getValue(), entry.getKey(), config.getKeeperCheckerIntervalMilli());
                 allKeeperContainerUsedInfoModels.remove(entry.getValue());
                 iterator.remove();
-            }
-            break;
+            } else break;
         }
     }
 

diff --git a/...console/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DefaultDelayService.java b/...console/src/main/java/com/ctrip/xpipe/redis/console/service/impl/DefaultDelayService.java
@@ -1,5 +1,6 @@
 package com.ctrip.xpipe.redis.console.service.impl;
 
+import com.ctrip.xpipe.api.command.CommandFuture;
 import com.ctrip.xpipe.api.foundation.FoundationService;
 import com.ctrip.xpipe.cluster.ClusterType;
 import com.ctrip.xpipe.command.AbstractCommand;
@@ -231,20 +232,23 @@ public UnhealthyInfoModel getAllUnhealthyInstance() {
 
         UnhealthyInfoModel infoAggregation = new UnhealthyInfoModel();
         ParallelCommandChain commandChain = new ParallelCommandChain(executors);
+        Map<String, CommandFuture<UnhealthyInfoModel>> results = new HashMap<>();
         for (String dcId : xpipeMeta.getDcs().keySet()) {
             FetchDcUnhealthyInstanceCmd cmd = new FetchDcUnhealthyInstanceCmd(dcId);
             commandChain.add(cmd);
-            cmd.future().addListener(commandFuture -> {
+            results.put(dcId, cmd.future());
+        }
+
+        try {
+            commandChain.execute().sync();
+            for (Map.Entry<String, CommandFuture<UnhealthyInfoModel>> result: results.entrySet()) {
+                CommandFuture<UnhealthyInfoModel> commandFuture = result.getValue();
                 if (commandFuture.isSuccess() && null != commandFuture.get()) {
                     infoAggregation.merge(commandFuture.get());
                 } else {
-                    infoAggregation.getAttachFailDc().add(dcId);
+                    infoAggregation.getAttachFailDc().add(result.getKey());
                 }
-            });
-        }
-
-        try {
-            commandChain.execute().get();
+            }
         } catch (Throwable th) {
             logger.info("[getAllUnhealthyInstance][fail] {}", th.getMessage());
         }

diff --git a/...com/ctrip/xpipe/redis/console/keeper/impl/DefaultKeeperContainerUsedInfoAnalyzerTest.java b/...com/ctrip/xpipe/redis/console/keeper/impl/DefaultKeeperContainerUsedInfoAnalyzerTest.java
@@ -1,5 +1,6 @@
 package com.ctrip.xpipe.redis.console.keeper.impl;
 
+import com.ctrip.xpipe.AbstractTest;
 import com.ctrip.xpipe.api.foundation.FoundationService;
 import com.ctrip.xpipe.redis.checker.model.DcClusterShard;
 import com.ctrip.xpipe.redis.checker.model.KeeperContainerUsedInfoModel;
@@ -28,7 +29,7 @@
  * 2023/9/20
  */
 @RunWith(org.mockito.junit.MockitoJUnitRunner.class)
-public class DefaultKeeperContainerUsedInfoAnalyzerTest {
+public class DefaultKeeperContainerUsedInfoAnalyzerTest extends AbstractTest {
 
     @InjectMocks
     private DefaultKeeperContainerUsedInfoAnalyzer analyzer;
@@ -80,6 +81,8 @@ public void testUpdateKeeperContainerUsedInfo() {
         model3.setDetailInfo(detailInfo3);
         models2.add(model3);
 
+        // avoid calling updateKeeperContainerUsedInfo in the same milliSecond and fail case
+        sleep(1);
         analyzer.updateKeeperContainerUsedInfo(1, models2);
         Assert.assertEquals(0, analyzer.getCheckerIndexes().size());
         Assert.assertEquals(0, analyzer.getAllKeeperContainerUsedInfoModels().size());

diff --git a/...trip/xpipe/redis/console/migration/status/migration/MigrationPartialSuccessStateTest.java b/...trip/xpipe/redis/console/migration/status/migration/MigrationPartialSuccessStateTest.java
@@ -8,6 +8,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
 import java.util.LinkedList;
@@ -82,8 +83,8 @@ public void testSingleThreadProcess() throws Exception {
         partialSuccessState.getStateActionState().tryAction();
 
         waitConditionUntilTimeOut(() -> retryCnt.get() >= failCnt);
-        verify(migrationCluster).updateStat(isA(MigrationPublishState.class));
-        verify(migrationCluster).process();
+        verify(migrationCluster, Mockito.timeout(3000).times(1)).updateStat(isA(MigrationPublishState.class));
+        verify(migrationCluster, Mockito.timeout(3000).times(1)).process();
     }
 
     @Test

diff --git a/...pipe/redis/keeper/ratelimit/AllTests.java → ...s/keeper/ratelimit/AllRateLimitTests.java b/...pipe/redis/keeper/ratelimit/AllTests.java → ...s/keeper/ratelimit/AllRateLimitTests.java
@@ -15,6 +15,6 @@
         FakeRedisRdbDumpLong.class,
         RateLimitTest.class,
 })
-public class AllTests {
+public class AllRateLimitTests {
 
 }
diff --git a/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/ratelimit/RateLimitTest.java b/redis/redis-keeper/src/test/java/com/ctrip/xpipe/redis/keeper/ratelimit/RateLimitTest.java
@@ -84,10 +84,8 @@ public void testBackupDcActiveKeeper_DrMigration_ShouldLimit() throws Exception
         redisKeeperServer1.getRedisKeeperServerState().becomeActive(new DefaultEndPoint("127.0.0.1", redisKeeperServer2.getListeningPort()));
 
         waitRedisKeeperServerConnected(redisKeeperServer1);
-        waitConditionUntilTimeOut(()->assertSuccess(()->{
-            verify(leakyBucket, times(1)).tryAcquire();
-            verify(leakyBucket, times(1)).release();
-        }));
+        verify(leakyBucket, timeout(5000).times(1)).tryAcquire();
+        verify(leakyBucket, timeout(5000).times(1)).release();
     }
 
 

diff --git a/services/ctrip-service/pom.xml b/services/ctrip-service/pom.xml
@@ -13,7 +13,7 @@
         <dubbo.version>2.7.8</dubbo.version>
         <fastjson.version>1.2.83</fastjson.version>
         <qtracer.version>1.3.9</qtracer.version>
-        <fireman.version>2.0.16</fireman.version>
+        <fireman.version>2.0.24</fireman.version>
     </properties>
 
     <dependencyManagement>