Clean up disk dirs created by test.
Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/4c02fe35 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/4c02fe35 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/4c02fe35 Branch: refs/heads/feature/close_cache_aeq_enqueue Commit: 4c02fe35c59f0ee25e291a7a3608b591efded7f8 Parents: f84159a Author: Lynn Hughes-Godfrey <[email protected]> Authored: Wed May 24 14:24:39 2017 -0700 Committer: Lynn Hughes-Godfrey <[email protected]> Committed: Wed May 24 14:24:39 2017 -0700 ---------------------------------------------------------------------- .../cache/wan/AsyncEventQueueTestBase.java | 2 + .../asyncqueue/AsyncEventListenerDUnitTest.java | 43 +++++++------------- 2 files changed, 16 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/4c02fe35/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java index 6fe7ee9..dc7a218 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/AsyncEventQueueTestBase.java @@ -98,6 +98,7 @@ import org.apache.geode.test.dunit.LogWriterUtils; import org.apache.geode.test.dunit.VM; import org.apache.geode.test.dunit.Wait; import org.apache.geode.test.dunit.WaitCriterion; +import org.apache.geode.test.dunit.cache.internal.JUnit4CacheTestCase; import org.apache.geode.test.dunit.internal.JUnit4DistributedTestCase; import org.apache.geode.test.junit.categories.DistributedTest; @@ -1555,6 +1556,7 @@ public class AsyncEventQueueTestBase extends JUnit4DistributedTestCase { public static void cleanupVM() throws IOException { closeCache(); + JUnit4CacheTestCase.cleanDiskDirs(); } public static void closeCache() throws IOException { http://git-wip-us.apache.org/repos/asf/geode/blob/4c02fe35/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java index 74aa776..7799216 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/cache/wan/asyncqueue/AsyncEventListenerDUnitTest.java @@ -1699,31 +1699,8 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase { vm1.invoke(() -> addAEQWithCacheCloseFilter()); vm2.invoke(() -> addAEQWithCacheCloseFilter()); - //vm1.invoke(() -> AsyncEventQueueTestBase.createPartitionedRegionWithAsyncEventQueue( - //getTestMethodName() + "_PR", "ln", isOffHeap())); - - vm1.invoke(() -> { - AttributesFactory fact = new AttributesFactory(); - - PartitionAttributesFactory pfact = new PartitionAttributesFactory(); - pfact.setTotalNumBuckets(16); - fact.setPartitionAttributes(pfact.create()); - fact.setDataPolicy(DataPolicy.PERSISTENT_PARTITION); - fact.setOffHeap(isOffHeap()); - Region r = cache.createRegionFactory(fact.create()).addAsyncEventQueueId("ln") - .create(getTestMethodName() + "_PR"); - }); - vm2.invoke(() -> { - AttributesFactory fact = new AttributesFactory(); - - PartitionAttributesFactory pfact = new PartitionAttributesFactory(); - pfact.setTotalNumBuckets(16); - fact.setPartitionAttributes(pfact.create()); - fact.setDataPolicy(DataPolicy.PERSISTENT_PARTITION); - fact.setOffHeap(isOffHeap()); - Region r = cache.createRegionFactory(fact.create()).addAsyncEventQueueId("ln") - .create(getTestMethodName() + "_PR"); - }); + vm1.invoke(() -> createPersistentPartitionRegion()); + vm2.invoke(() -> createPersistentPartitionRegion()); vm3.invoke(() -> { AttributesFactory fact = new AttributesFactory(); @@ -1749,10 +1726,20 @@ public class AsyncEventListenerDUnitTest extends AsyncEventQueueTestBase { } }); - - vm1.invoke(() -> Awaitility.await().atMost(1, TimeUnit.MINUTES).until(() -> cache.isClosed())); } +private void createPersistentPartitionRegion() { + AttributesFactory fact = new AttributesFactory(); + + PartitionAttributesFactory pfact = new PartitionAttributesFactory(); + pfact.setTotalNumBuckets(16); + fact.setPartitionAttributes(pfact.create()); + fact.setDataPolicy(DataPolicy.PERSISTENT_PARTITION); + fact.setOffHeap(isOffHeap()); + Region r = cache.createRegionFactory(fact.create()).addAsyncEventQueueId("ln") + .create(getTestMethodName() + "_PR"); +} + private void addAEQWithCacheCloseFilter() { cache.createAsyncEventQueueFactory().addGatewayEventFilter(new CloseCacheGatewayFilter()).setPersistent(true).setParallel(true) .create("ln", new MyAsyncEventListener()); @@ -1777,9 +1764,7 @@ private void addAEQWithCacheCloseFilter() { private final class CloseCacheGatewayFilter implements GatewayEventFilter { @Override public boolean beforeEnqueue(final GatewayQueueEvent event) { - // if (event.getOperation().isDestroy()) { if (event.getOperation().isRemoveAll()) { - System.out.println("cacheCloseFilter: isRemoveAll = true"); new Thread(() -> cache.close()).start(); try { Thread.sleep(1000);
