Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id A4FCA200C73 for ; Tue, 25 Apr 2017 20:27:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A3BB9160B8E; Tue, 25 Apr 2017 18:27:23 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F223B160BB3 for ; Tue, 25 Apr 2017 20:27:22 +0200 (CEST) Received: (qmail 47780 invoked by uid 500); 25 Apr 2017 18:27:22 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 47693 invoked by uid 99); 25 Apr 2017 18:27:22 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 25 Apr 2017 18:27:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id F13F8DFBBB; Tue, 25 Apr 2017 18:27:21 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: dschneider@apache.org To: commits@geode.apache.org Date: Tue, 25 Apr 2017 18:27:21 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] geode git commit: GEODE-2097: fix flaky test archived-at: Tue, 25 Apr 2017 18:27:23 -0000 Repository: geode Updated Branches: refs/heads/feature/GEODE-2811 e68aa5fe4 -> da4d64f90 GEODE-2097: fix flaky test Project: http://git-wip-us.apache.org/repos/asf/geode/repo Commit: http://git-wip-us.apache.org/repos/asf/geode/commit/6eb9ff36 Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/6eb9ff36 Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/6eb9ff36 Branch: refs/heads/feature/GEODE-2811 Commit: 6eb9ff36dddeaaea01f624b453b4fa6d308b93f4 Parents: 45dc674 Author: Darrel Schneider Authored: Fri Apr 21 16:36:14 2017 -0700 Committer: Darrel Schneider Committed: Mon Apr 24 08:59:47 2017 -0700 ---------------------------------------------------------------------- .../OffHeapLRURecoveryRegressionTest.java | 27 ++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/geode/blob/6eb9ff36/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java ---------------------------------------------------------------------- diff --git a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java index 489c62b..bb781e6 100644 --- a/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java +++ b/geode-core/src/test/java/org/apache/geode/internal/offheap/OffHeapLRURecoveryRegressionTest.java @@ -19,7 +19,9 @@ import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT; import static org.junit.Assert.assertEquals; import java.util.Properties; +import java.util.concurrent.TimeUnit; +import org.awaitility.Awaitility; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -49,7 +51,6 @@ public class OffHeapLRURecoveryRegressionTest { @Test public void recoveringTooMuchDataDoesNotRunOutOfOffHeapMemory() { final int ENTRY_COUNT = 40; - final int expectedObjectCount; GemFireCacheImpl gfc = createCache(); try { Region r = createRegion(gfc); @@ -57,29 +58,26 @@ public class OffHeapLRURecoveryRegressionTest { for (int i = 0; i < ENTRY_COUNT; i++) { r.put(i, v); } - // expect one more during recovery because of the way the LRU limit is - // enforced during recover. - expectedObjectCount = MemoryAllocatorImpl.getAllocator().getStats().getObjects() + 1; } finally { - gfc.close(); + closeCache(gfc); } + Awaitility.await().atMost(60, TimeUnit.SECONDS).until(() -> { + return MemoryAllocatorImpl.getAllocator().getStats().getObjects() == 0; + }); System.setProperty("gemfire.disk.recoverValuesSync", "true"); System.setProperty("gemfire.disk.recoverLruValues", "true"); try { gfc = createCache(); try { - Region r = createRegion(gfc); + createDiskStore(gfc); try { - assertEquals(ENTRY_COUNT, r.size()); - assertEquals(expectedObjectCount, - MemoryAllocatorImpl.getAllocator().getStats().getObjects()); + assertEquals(10, MemoryAllocatorImpl.getAllocator().getStats().getObjects()); } finally { - r.destroyRegion(); DiskStore ds = gfc.findDiskStore(DS_NAME); ds.destroy(); } } finally { - gfc.close(); + closeCache(gfc); } } finally { System.clearProperty("gemfire.disk.recoverValuesSync"); @@ -97,9 +95,13 @@ public class OffHeapLRURecoveryRegressionTest { return result; } - private Region createRegion(GemFireCacheImpl gfc) { + private void createDiskStore(GemFireCacheImpl gfc) { DiskStoreFactory dsf = gfc.createDiskStoreFactory(); dsf.create(DS_NAME); + } + + private Region createRegion(GemFireCacheImpl gfc) { + createDiskStore(gfc); RegionFactory rf = gfc.createRegionFactory(RegionShortcut.LOCAL_PERSISTENT_OVERFLOW); rf.setOffHeap(true); @@ -110,6 +112,5 @@ public class OffHeapLRURecoveryRegressionTest { private void closeCache(GemFireCacheImpl gfc) { gfc.close(); - MemoryAllocatorImpl.freeOffHeapMemory(); } }