report dest Redis as unhealthy instance in unhealthy bi_direction repl

ctripcorp · Feb 8, 2024 · 3af08be · 3af08be
1 parent 58ed806
commit 3af08be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/.../main/java/com/ctrip/xpipe/redis/console/service/impl/DefaultCrossMasterDelayService.java b/.../main/java/com/ctrip/xpipe/redis/console/service/impl/DefaultCrossMasterDelayService.java
@@ -87,11 +87,13 @@ public UnhealthyInfoModel getCurrentDcUnhealthyMasters() {
         for (DcClusterShard dcClusterShard : crossMasterDelays.keySet()) {
             if (!checkDcClusterShard(xpipeMeta, dcClusterShard)) continue;
 
-            for (Pair<HostPort, Long> targetDcDelay : crossMasterDelays.get(dcClusterShard).values()) {
-                Long delay = targetDcDelay.getValue();
-                if (null == delay || delay < 0 || delay == DelayAction.SAMPLE_LOST_BUT_PONG) {
-                    unhealthyInfo.addUnhealthyInstance(dcClusterShard.getClusterId(), dcClusterShard.getDcId(),
-                            dcClusterShard.getShardId(), findMasterOf(dcClusterShard, xpipeMeta), true);
+            for (Map.Entry<String, Pair<HostPort, Long>> crossDcDelay: crossMasterDelays.get(dcClusterShard).entrySet()) {
+                String targetDc = crossDcDelay.getKey();
+                HostPort targetMaster = crossDcDelay.getValue().getKey();
+                Long delay = crossDcDelay.getValue().getValue();
+                if (null == delay || delay < 0 || delay >= DelayAction.SAMPLE_LOST_BUT_PONG) {
+                    unhealthyInfo.addUnhealthyInstance(dcClusterShard.getClusterId(), targetDc,
+                            dcClusterShard.getShardId(), targetMaster, true);
                     break;
                 }
             }

diff --git a/...src/test/java/com/ctrip/xpipe/redis/console/service/impl/CrossMasterDelayServiceTest.java b/...src/test/java/com/ctrip/xpipe/redis/console/service/impl/CrossMasterDelayServiceTest.java
@@ -99,8 +99,8 @@ public void testCrossMasterReplicationHealthy() {
 
     @Test
     public void testCrossMasterReplicationUnhealthy() {
-        UnhealthyInfoModel.RedisHostPort expectedMaster = new UnhealthyInfoModel.RedisHostPort(new HostPort("127.0.0.1", 6379), true);
-        Mockito.when(instance.getCheckInfo()).thenReturn(new DefaultRedisInstanceInfo("oy", clusterId, shardId, new HostPort(), null, ClusterType.BI_DIRECTION));
+        UnhealthyInfoModel.RedisHostPort expectedMaster = new UnhealthyInfoModel.RedisHostPort(new HostPort("127.0.0.2", 6379), true);
+        Mockito.when(instance.getCheckInfo()).thenReturn(new DefaultRedisInstanceInfo("oy", clusterId, shardId, new HostPort("127.0.0.2", 6379), null, ClusterType.BI_DIRECTION));
 
         service.onAction(new DelayActionContext(instance, DelayAction.SAMPLE_LOST_BUT_PONG));
         UnhealthyInfoModel infoModel = service.getCurrentDcUnhealthyMasters();