geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject geode git commit: GEODE-3416: Moved the clearing of the map to be outside of the loop in the close() method Amended the threadPoolExecutor to set the correct thread timeout. Using th asyncClosePoolKeepAlive instead of asyncCloseWait.
Date Tue, 15 Aug 2017 16:47:19 GMT
Repository: geode
Updated Branches:
  refs/heads/feature/GEODE-3416 8d0f09316 -> 170e333a9


GEODE-3416: Moved the clearing of the map to be outside of the loop
in the close() method
Amended the threadPoolExecutor to set the correct thread timeout. Using
th asyncClosePoolKeepAlive instead of asyncCloseWait.


Project: http://git-wip-us.apache.org/repos/asf/geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/170e333a
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/170e333a
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/170e333a

Branch: refs/heads/feature/GEODE-3416
Commit: 170e333a9f07c74297d0875ef244de118a656bd0
Parents: 8d0f093
Author: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Authored: Tue Aug 15 09:47:15 2017 -0700
Committer: Udo Kohlmeyer <ukohlmeyer@pivotal.io>
Committed: Tue Aug 15 09:47:15 2017 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/geode/internal/net/SocketCloser.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode/blob/170e333a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
index e2a9b7f..63873a2 100644
--- a/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
+++ b/geode-core/src/main/java/org/apache/geode/internal/net/SocketCloser.java
@@ -135,7 +135,7 @@ public class SocketCloser {
     };
 
     executorService = new ThreadPoolExecutor(asyncClosePoolMaxThreads, asyncClosePoolMaxThreads,
-        asyncCloseWaitTime, asyncCloseWaitUnits, new LinkedBlockingQueue<>(), threadFactory);
+        asyncClosePoolKeepAliveSeconds, TimeUnit.SECONDS, new LinkedBlockingQueue<>(),
threadFactory);
   }
 
   /**
@@ -165,8 +165,8 @@ public class SocketCloser {
     }
     for (ExecutorService executorService : asyncCloseExecutors.values()) {
       executorService.shutdown();
-      asyncCloseExecutors.clear();
     }
+    asyncCloseExecutors.clear();
   }
 
   private Future asyncExecute(String address, Runnable runnableToExecute) {
@@ -232,7 +232,7 @@ public class SocketCloser {
       try {
         submittedTask.get(this.asyncCloseWaitTime, this.asyncCloseWaitUnits);
       } catch (InterruptedException | ExecutionException | TimeoutException e) {
-        // We want this code to wait at most 50ms for the close to happen.
+        // We want this code to wait at most the asyncCloseWaitTime for the close to happen.
         // It is ok to ignore these exception and let the close continue
         // in the background.
       }


Mime
View raw message