Update the comment

redis · Feb 19, 2025 · be55f44 · be55f44
1 parent 370a172
commit be55f44
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java b/src/main/java/io/lettuce/core/cluster/ClusterTopologyRefreshScheduler.java
@@ -337,18 +337,13 @@ private static class ClusterTopologyRefreshTask extends AtomicBoolean implements
 
         public void run() {
 
-            refreshLock.lock();
-            try {
-                if (compareAndSet(false, true)) {
-                    doRun();
-                    return;
-                }
-
-                if (logger.isDebugEnabled()) {
-                    logger.debug("ClusterTopologyRefreshTask already in progress");
-                }
-            } finally {
-                refreshLock.unlock();
+            if (compareAndSet(false, true)) {
+                doRun();
+                return;
+            }
+
+            if (logger.isDebugEnabled()) {
+                logger.debug("ClusterTopologyRefreshTask already in progress");
             }
         }
 
@@ -366,6 +361,8 @@ void doRun() {
 
                     refreshLock.lock();
                     try {
+                        reloadTopologyAsync.get();
+
                         set(false);
                         refreshComplete.signalAll();
                     } finally {

diff --git a/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java b/src/main/java/io/lettuce/core/cluster/RedisClusterClient.java
@@ -1155,22 +1155,12 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
 
         suspendTopologyRefresh();
         ReentrantLock refreshLock = topologyRefreshScheduler.getRefreshLock();
-        Condition refreshComplete = topologyRefreshScheduler.getRefreshComplete();
-
         refreshLock.lock();
         try {
-            while (topologyRefreshScheduler.isTopologyRefreshInProgress()) {
-                try {
-                    refreshComplete.await();
-                } catch (InterruptedException e) {
-                    Thread.currentThread().interrupt();
-                }
-            }
+            return super.shutdownAsync(quietPeriod, timeout, timeUnit);
         } finally {
             refreshLock.unlock();
         }
-
-        return super.shutdownAsync(quietPeriod, timeout, timeUnit);
     }
 
     // -------------------------------------------------------------------------