Fixed - failover handling in Sentinel mode #6219

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

@@ -364,13 +364,12 @@ public class SentinelConnectionManager extends MasterSlaveConnectionManager {
     private void updateState(SentinelServersConfig cfg, RedisConnection connection, Iterator<RedisClient> iterator,
                              AtomicReference<Throwable> lastException) {
         List<CompletableFuture<?>> futures = new ArrayList<>();
-        CompletionStage<RedisClient> masterFuture = checkMasterChange(cfg, connection);
+        CompletionStage<?> f = checkMasterChange(cfg, connection);
-        futures.add(masterFuture.toCompletableFuture());
 
         if (!config.isSlaveNotUsed()) {
-            CompletionStage<Void> slavesFuture = checkSlavesChange(cfg, connection);
+            f = f.thenCompose(r -> checkSlavesChange(cfg, connection));
-            futures.add(slavesFuture.toCompletableFuture());
         }
+        futures.add(f.toCompletableFuture());
 
         CompletionStage<Void> sentinelsFuture = checkSentinelsChange(cfg, connection);
         futures.add(sentinelsFuture.toCompletableFuture());