Fixed - Sentinel master-host = ? setting isn't handled properly during slave check. #3932

3 years ago · a7eeedbb37
parent ae889ad268
commit a7eeedbb37
1 changed files with 6 additions and 1 deletions
--- a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
+++ b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
@ -457,7 +457,12 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
                String masterPort = map.get("master-port");

                RFuture<RedisURI> slaveAddrFuture = resolveIP(host, port);
-                RFuture<RedisURI> masterAddrFuture = resolveIP(masterHost, masterPort);
+                RFuture<RedisURI> masterAddrFuture;
+                if ("?".equals(masterHost)) {
+                    masterAddrFuture = RedissonPromise.newSucceededFuture(null);
+                } else {
+                    masterAddrFuture = resolveIP(masterHost, masterPort);
+                }
                CompletableFuture<Void> resolvedFuture = CompletableFuture.allOf(masterAddrFuture.toCompletableFuture(),
                                                                                    slaveAddrFuture.toCompletableFuture());
                resolvedFuture.whenComplete((res, exc) -> {