Fixed - replicatedServers should use ip addresses if nodes defined using hostnames. #3736

redisson/src/main/java/org/redisson/connection/ReplicatedConnectionManager.java

@@ -48,7 +48,7 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
 
     private final Logger log = LoggerFactory.getLogger(getClass());
 
-    private final AtomicReference<RedisURI> currentMaster = new AtomicReference<>();
+    private final AtomicReference<InetSocketAddress> currentMaster = new AtomicReference<>();
 
     private ScheduledFuture<?> monitorFuture;
 
@@ -74,7 +74,7 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
 
             Role role = Role.valueOf(connection.sync(RedisCommands.INFO_REPLICATION).get(ROLE_KEY));
             if (Role.master.equals(role)) {
-                currentMaster.set(addr);
+                currentMaster.set(connection.getRedisClient().getAddr());
                 log.info("{} is the master", addr);
                 this.config.setMasterAddress(addr.toString());
             } else {
@@ -115,13 +115,13 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
                     return;
                 }
 
-                RedisURI master = currentMaster.get();
+                InetSocketAddress master = currentMaster.get();
                 log.debug("Current master: {}", master);
                 
                 AtomicInteger count = new AtomicInteger(cfg.getNodeAddresses().size());
                 for (String address : cfg.getNodeAddresses()) {
-                    RedisURI addr = new RedisURI(address);
-                    RFuture<RedisConnection> connectionFuture = connectToNode(cfg, addr, addr.getHost());
+                    RedisURI uri = new RedisURI(address);
+                    RFuture<RedisConnection> connectionFuture = connectToNode(cfg, uri, uri.getHost());
                     connectionFuture.onComplete((connection, exc) -> {
                         if (exc != null) {
                             log.error(exc.getMessage(), exc);
@@ -145,13 +145,14 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
                                 }
                                 return;
                             }
-                            
+
+                            InetSocketAddress addr = connection.getRedisClient().getAddr();
                             Role role = Role.valueOf(r.get(ROLE_KEY));
                             if (Role.master.equals(role)) {
                                 if (master.equals(addr)) {
                                     log.debug("Current master {} unchanged", master);
                                 } else if (currentMaster.compareAndSet(master, addr)) {
-                                    RFuture<RedisClient> changeFuture = changeMaster(singleSlotRange.getStartSlot(), addr);
+                                    RFuture<RedisClient> changeFuture = changeMaster(singleSlotRange.getStartSlot(), uri);
                                     changeFuture.onComplete((res, e) -> {
                                         if (e != null) {
                                             currentMaster.compareAndSet(addr, master);
@@ -159,7 +160,7 @@ public class ReplicatedConnectionManager extends MasterSlaveConnectionManager {
                                     });
                                 }
                             } else if (!config.checkSkipSlavesInit()) {
-                                slaveUp(addr, connection.getRedisClient().getAddr());
+                                slaveUp(uri, addr);
                             }
                             
                             if (count.decrementAndGet() == 0) {