chore: refine logging

redis · Aug 29, 2024 · 82ca33f · 82ca33f
1 parent 5ad30d0
commit 82ca33f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 19 deletions.
diff --git a/src/main/java/io/lettuce/core/context/AutoBatchFlushEndPointContext.java b/src/main/java/io/lettuce/core/context/AutoBatchFlushEndPointContext.java
@@ -106,7 +106,12 @@ public boolean addRetryableFailedToSendCommand(RedisCommand<?, ?, ?> retryableCo
             return true;
         }
 
-        retryableFailedToSendCommands.add(retryableCommand);
+        try {
+            retryableFailedToSendCommands.add(retryableCommand);
+        } catch (Exception e) {
+            logger.error("[unexpected] retryableFailedToSendCommands is empty, but we are adding a command: {}",
+                    retryableCommand);
+        }
         return false;
     }
 

diff --git a/src/main/java/io/lettuce/core/protocol/DefaultAutoBatchFlushEndpoint.java b/src/main/java/io/lettuce/core/protocol/DefaultAutoBatchFlushEndpoint.java
@@ -15,6 +15,24 @@
  */
 package io.lettuce.core.protocol;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Deque;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Queue;
+import java.util.Set;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
+import java.util.function.Consumer;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import io.lettuce.core.ClientOptions;
 import io.lettuce.core.ConnectionEvents;
 import io.lettuce.core.ContextualChannel;
@@ -43,23 +61,6 @@
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Deque;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Queue;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CopyOnWriteArrayList;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
-import java.util.function.Consumer;
-
 /**
  * Default {@link Endpoint} implementation.
  *
@@ -779,7 +780,7 @@ private void trySetEndpointQuiescence(ContextualChannel chan) {
         if (chan.context.setChannelQuiescentOnce()) {
             onEndpointQuiescence();
         } else {
-            ExceptionUtils.maybeFire(logger, canFire, "unexpected: setEndpointQuiescenceOncePerConnection() failed");
+            ExceptionUtils.maybeFire(logger, canFire, "unexpected: quiescence already acquired");
         }
     }