You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2016/05/21 00:24:30 UTC

incubator-geode git commit: GEODE-1427: change test to close the cache

Repository: incubator-geode
Updated Branches:
  refs/heads/develop 853c40d26 -> ea19e3cae


GEODE-1427: change test to close the cache


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

Branch: refs/heads/develop
Commit: ea19e3caeccbc01f61acd6d84734d8c136ee52a5
Parents: 853c40d
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Fri May 20 17:23:11 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Fri May 20 17:24:03 2016 -0700

----------------------------------------------------------------------
 .../gemfire/internal/cache/GemFireCacheImplTest.java      | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/ea19e3ca/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GemFireCacheImplTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GemFireCacheImplTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GemFireCacheImplTest.java
index 3dc2f7a..7f95cad 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GemFireCacheImplTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/GemFireCacheImplTest.java
@@ -22,6 +22,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.junit.After;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -36,9 +38,9 @@ public class GemFireCacheImplTest {
   public void checkThatAsyncEventListenersUseAllThreadsInPool() {
     
     GemFireCacheImpl gfc = GemFireCacheImpl.createWithAsyncEventListeners(Fakes.distributedSystem(), new CacheConfig());
+    try {
     ThreadPoolExecutor executor = (ThreadPoolExecutor) gfc.getEventThreadPool();
     final long initialCount = executor.getCompletedTaskCount();
-    try {
       int MAX_THREADS = GemFireCacheImpl.EVENT_THREAD_LIMIT;
       final CountDownLatch cdl = new CountDownLatch(MAX_THREADS);
       for (int i = 1; i <= MAX_THREADS; i++) {
@@ -59,8 +61,10 @@ public class GemFireCacheImplTest {
         return executor.getCompletedTaskCount() == MAX_THREADS+initialCount;
       });
     } finally {
-      executor.shutdown();
+      // Note: if close is called it tries to dispatch and event which does not work
+      // because the async event pool has been shutdown.
+      // Once GEODE-1428 is fixed this test can call close instead of emergencyClose
+      gfc.emergencyClose();
     }
   }
-
 }