Merge pull request #809 from ctripcorp/revert-808-bugfix/sentinel-check-getRedisOfDcClusterShard

LanternLee · web-flow · commit e21cb6e602b0 · 2024-05-29T19:54:11.000+08:00
Revert "fix getRedisOfDcClusterShard in sentinel check"
diff --git a/redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/healthcheck/actions/sentinel/collector/CurrentDcSentinelHelloCollector.java b/redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/healthcheck/actions/sentinel/collector/CurrentDcSentinelHelloCollector.java
@@ -67,6 +67,6 @@ private boolean checkDcClusterShardExist(String dcId, String clusterId, String s
 
     @Override
     protected List<HostPort> getShardInstances(RedisInstanceInfo info) {
-        return metaCache.getRedisOfDcClusterShard(currentDc, info.getClusterId(), info.getShardId()).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());
+        return metaCache.getRedisOfDcClusterShard(info.getClusterId(),info.getShardId(),currentDc).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());
     }
 }
diff --git a/redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/healthcheck/actions/sentinel/collector/DefaultSentinelHelloCollector.java b/redis/redis-checker/src/main/java/com/ctrip/xpipe/redis/checker/healthcheck/actions/sentinel/collector/DefaultSentinelHelloCollector.java
@@ -191,7 +191,7 @@ protected HostPort getMaster(RedisInstanceInfo info) throws MasterNotFoundExcept
     }
 
     protected List<HostPort> getShardInstances(RedisInstanceInfo info) {
-        return metaCache.getRedisOfDcClusterShard(info.getActiveDc(), info.getClusterId(), info.getShardId()).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());
+        return metaCache.getRedisOfDcClusterShard(info.getClusterId(), info.getShardId(), info.getActiveDc()).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());
     }
 
     public class SentinelHelloCollectorCommand extends AbstractCommand<Void> {

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,6 @@ private boolean checkDcClusterShardExist(String dcId, String clusterId, String s`
`67`	`67`
`68`	`68`	`@Override`
`69`	`69`	`protected List<HostPort> getShardInstances(RedisInstanceInfo info) {`
`70`		`- return metaCache.getRedisOfDcClusterShard(currentDc, info.getClusterId(), info.getShardId()).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());`
	`70`	`+ return metaCache.getRedisOfDcClusterShard(info.getClusterId(),info.getShardId(),currentDc).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ protected HostPort getMaster(RedisInstanceInfo info) throws MasterNotFoundExcept`
`191`	`191`	`}`
`192`	`192`
`193`	`193`	`protected List<HostPort> getShardInstances(RedisInstanceInfo info) {`
`194`		`- return metaCache.getRedisOfDcClusterShard(info.getActiveDc(), info.getClusterId(), info.getShardId()).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());`
	`194`	`+ return metaCache.getRedisOfDcClusterShard(info.getClusterId(), info.getShardId(), info.getActiveDc()).stream().map(redisMeta -> new HostPort(redisMeta.getIp(),redisMeta.getPort())).collect(Collectors.toList());`
`195`	`195`	`}`
`196`	`196`
`197`	`197`	`public class SentinelHelloCollectorCommand extends AbstractCommand<Void> {`