Do not suspend auto reconnect on protected mode #2770

We now no longer suspend auto-reconnect when a connection encounters protected mode.
redis · Mar 5, 2024 · bb9cd0d · bb9cd0d
1 parent faffc7e
commit bb9cd0d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/main/java/io/lettuce/core/protocol/CommandHandler.java b/src/main/java/io/lettuce/core/protocol/CommandHandler.java
@@ -884,12 +884,12 @@ private void onProtectedMode(String message) {
 
         endpoint.notifyException(exception);
 
+        stack.forEach(cmd -> cmd.completeExceptionally(exception));
+        stack.clear();
+
         if (channel != null) {
             channel.disconnect();
         }
-
-        stack.forEach(cmd -> cmd.completeExceptionally(exception));
-        stack.clear();
     }
 
     /**

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultEndpoint.java
@@ -518,12 +518,6 @@ public void notifyException(Throwable t) {
         if (t instanceof RedisConnectionException && RedisConnectionException.isProtectedMode(t.getMessage())) {
 
             connectionError = t;
-
-            if (connectionWatchdog != null) {
-                connectionWatchdog.setListenOnChannelInactive(false);
-                connectionWatchdog.setReconnectSuspended(false);
-            }
-
             doExclusive(this::drainCommands).forEach(cmd -> cmd.completeExceptionally(t));
         }