Add shutdown logging to client, ClientResources, and EventLoopGroupPr…

…ovider redis#918
gavincook · Nov 12, 2018 · ce632ff · ce632ff
1 parent d0398cc
commit ce632ff
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/io/lettuce/core/AbstractRedisClient.java b/src/main/java/io/lettuce/core/AbstractRedisClient.java
@@ -433,6 +433,8 @@ public CompletableFuture<Void> shutdownAsync(long quietPeriod, long timeout, Tim
 
         if (shutdown.compareAndSet(false, true)) {
 
+            logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
+
             List<CompletableFuture<Void>> closeFutures = new ArrayList<>();
 
             while (!closeableResources.isEmpty()) {

diff --git a/src/main/java/io/lettuce/core/resource/DefaultClientResources.java b/src/main/java/io/lettuce/core/resource/DefaultClientResources.java
@@ -573,6 +573,8 @@ public Future<Boolean> shutdown() {
     @SuppressWarnings("unchecked")
     public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
 
+        logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
+
         shutdownCalled = true;
         DefaultPromise<Boolean> overall = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
         DefaultPromise<Boolean> lastRelease = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);

diff --git a/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java b/src/main/java/io/lettuce/core/resource/DefaultEventLoopGroupProvider.java
@@ -59,7 +59,9 @@ public DefaultEventLoopGroupProvider(int numberOfThreads) {
 
     @Override
     public <T extends EventLoopGroup> T allocate(Class<T> type) {
+
         synchronized (this) {
+            logger.debug("Allocating executor {}", type.getName());
             return addReference(getOrCreate(type));
         }
     }
@@ -133,6 +135,8 @@ private <T extends EventLoopGroup> T getOrCreate(Class<T> type) {
      */
     public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopGroup(Class<T> type, int numberOfThreads) {
 
+        logger.debug("Creating executor {}", type.getName());
+
         if (DefaultEventExecutorGroup.class.equals(type)) {
             return new DefaultEventExecutorGroup(numberOfThreads, new DefaultThreadFactory("lettuce-eventExecutorLoop", true));
         }
@@ -155,6 +159,8 @@ public static <T extends EventExecutorGroup> EventExecutorGroup createEventLoopG
     @Override
     public Promise<Boolean> release(EventExecutorGroup eventLoopGroup, long quietPeriod, long timeout, TimeUnit unit) {
 
+        logger.debug("Release executor {}", eventLoopGroup);
+
         Class<?> key = getKey(release(eventLoopGroup));
 
         if ((key == null && eventLoopGroup.isShuttingDown()) || refCounter.containsKey(eventLoopGroup)) {
@@ -192,13 +198,16 @@ public int threadPoolSize() {
     @Override
     @SuppressWarnings("unchecked")
     public Future<Boolean> shutdown(long quietPeriod, long timeout, TimeUnit timeUnit) {
+
+        logger.debug("Initiate shutdown ({}, {}, {})", quietPeriod, timeout, timeUnit);
+
         shutdownCalled = true;
 
         Map<Class<? extends EventExecutorGroup>, EventExecutorGroup> copy = new HashMap<>(eventLoopGroups);
 
-        DefaultPromise<Boolean> overall = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        DefaultPromise<Boolean> lastRelease = new DefaultPromise<Boolean>(GlobalEventExecutor.INSTANCE);
-        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<Boolean, Promise<Boolean>>(overall);
+        DefaultPromise<Boolean> overall = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+        DefaultPromise<Boolean> lastRelease = new DefaultPromise<>(GlobalEventExecutor.INSTANCE);
+        Futures.PromiseAggregator<Boolean, Promise<Boolean>> aggregator = new Futures.PromiseAggregator<>(overall);
 
         aggregator.expectMore(1 + copy.size());