refactor: better naming

redis · Aug 8, 2024 · 19e6463 · 19e6463
1 parent 2b57334
commit 19e6463
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 20 deletions.
diff --git a/src/main/java/io/lettuce/core/context/AutoBatchFlushEndPointContext.java b/src/main/java/io/lettuce/core/context/AutoBatchFlushEndPointContext.java
@@ -73,16 +73,9 @@ public int getFlyingCmdNum() {
         return flyingCmdNum;
     }
 
-    private int total = 0;
-
-    public int getTotal() {
-        return total;
-    }
-
     public final HasOngoingSendLoop hasOngoingSendLoop = new HasOngoingSendLoop();
 
     public void add(int n) {
-        this.total += n;
         this.flyingCmdNum += n;
     }
 
@@ -100,7 +93,7 @@ public void done(int n) {
 
     public boolean isDone() {
         if (this.flyingCmdNum < 0) {
-            logger.error("[unexpected] flyingCmdNum < 0, flyingCmdNum: {}, total: {}", this.flyingCmdNum, this.total);
+            logger.error("[unexpected] flyingCmdNum < 0, flyingCmdNum: {}", this.flyingCmdNum);
             return true;
         }
         return this.flyingCmdNum == 0;

diff --git a/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java b/src/main/java/io/lettuce/core/protocol/ConnectionWatchdog.java
@@ -106,7 +106,7 @@ public class ConnectionWatchdog extends ChannelInboundHandlerAdapter {
 
     private volatile Timeout reconnectScheduleTimeout;
 
-    private Runnable doReconnectOnEndpointQuiescence;
+    private Runnable doReconnectOnAutoBatchFlushEndpointQuiescence;
 
     /**
      * Create a new watchdog that adds to new connections to the supplied {@link ChannelGroup} and establishes a new
@@ -204,7 +204,7 @@ public void channelActive(ChannelHandlerContext ctx) throws Exception {
 
     @Override
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
-        doReconnectOnEndpointQuiescence = null;
+        doReconnectOnAutoBatchFlushEndpointQuiescence = null;
 
         logger.debug("{} channelInactive()", logPrefix());
         if (!armed) {
@@ -225,10 +225,10 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
                 return;
             }
 
-            doReconnectOnEndpointQuiescence = this::scheduleReconnect;
             if (!useAutoBatchFlushEndpoint) {
-                doReconnectOnEndpointQuiescence.run();
+                this.scheduleReconnect();
             }
+            doReconnectOnAutoBatchFlushEndpointQuiescence = this::scheduleReconnect;
             // otherwise, will be called later by BatchFlushEndpoint#onEndpointQuiescence
         } else {
             logger.debug("{} Reconnect scheduling disabled", logPrefix(), ctx);
@@ -237,8 +237,12 @@ public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         super.channelInactive(ctx);
     }
 
-    void reconnectOnEndpointQuiescence() {
-        doReconnectOnEndpointQuiescence.run();
+    boolean willReconnect() {
+        return doReconnectOnAutoBatchFlushEndpointQuiescence != null;
+    }
+
+    void reconnectOnAutoBatchFlushEndpointQuiescence() {
+        doReconnectOnAutoBatchFlushEndpointQuiescence.run();
     }
 
     /**
@@ -482,8 +486,4 @@ private String logPrefix() {
         return logPrefix = buffer;
     }
 
-    public boolean willReconnect() {
-        return doReconnectOnEndpointQuiescence != null;
-    }
-
 }
diff --git a/src/main/java/io/lettuce/core/protocol/DefaultAutoBatchFlushEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultAutoBatchFlushEndpoint.java
@@ -354,7 +354,7 @@ public void notifyReconnectFailed(Throwable t) {
 
         if (!CHANNEL.compareAndSet(this, DummyContextualChannelInstances.CHANNEL_CONNECTING,
                 DummyContextualChannelInstances.CHANNEL_RECONNECT_FAILED)) {
-            onUnexpectedState("notifyReconnectFailed", ConnectionContext.State.CONNECTING);
+            syncAfterTerminated(() -> onUnexpectedState("notifyReconnectFailed", ConnectionContext.State.CONNECTING));
             return;
         }
 
@@ -741,7 +741,7 @@ private void onEndpointQuiescence() {
         }
 
         // neither connectionWatchdog nor doReconnectOnEndpointQuiescence could be null
-        connectionWatchdog.reconnectOnEndpointQuiescence();
+        connectionWatchdog.reconnectOnAutoBatchFlushEndpointQuiescence();
     }
 
     private void onWillReconnect(@Nonnull final ConnectionContext.CloseStatus closeStatus,