Fixed - Sentinel slave can't be recovered if it's a master node

1 year ago · cfd69a4689
parent 6266e12581
commit cfd69a4689
1 changed files with 1 additions and 1 deletions
--- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@ -623,7 +623,7 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {

    private boolean isUseSameMaster(RedisURI slaveAddr, RedisURI slaveMasterAddr) {
        RedisURI master = currentMaster.get();
-        if (!master.equals(slaveMasterAddr)) {
+        if (!master.equals(slaveMasterAddr) && !slaveAddr.equals(master)) {
            log.warn("Skipped slave up {} for master {} differs from current {}", slaveAddr, slaveMasterAddr, master);
            return false;
        }