From a7eeedbb37e5715d527ca9035e48b33375dbbe82 Mon Sep 17 00:00:00 2001
From: Nikita Koksharov <nkoksharov@redisson.pro>
Date: Thu, 4 Nov 2021 13:54:56 +0300
Subject: [PATCH] Fixed - Sentinel master-host = ? setting isn't handled
 properly during slave check. #3932

---
 .../org/redisson/connection/SentinelConnectionManager.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java b/redisson/src/main/java/org/redisson/connection/SentinelConnectionManager.java
index c7549aff0..299e4be50 100755
--- 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) -> {