You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by zh...@apache.org on 2017/04/27 17:24:39 UTC
[09/26] geode git commit: GEODE-2097: fix flaky test
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/0540d61d
Tree: http://git-wip-us.apache.org/repos/asf/geode/tree/0540d61d
Diff: http://git-wip-us.apache.org/repos/asf/geode/diff/0540d61d
Branch: refs/heads/feature/GEM-1299
Commit: 0540d61db4c3798bb4d35036a6d65fae3d164ef2
Parents: ea3420b3
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Fri Apr 21 16:36:14 2017 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Wed Apr 26 23:28:49 2017 -0700
----------------------------------------------------------------------
.../OffHeapLRURecoveryRegressionTest.java | 27 ++++++++++----------
1 file changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode/blob/0540d61d/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<Object, Object> 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<Object, Object> 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<Object, Object> createRegion(GemFireCacheImpl gfc) {
+ private void createDiskStore(GemFireCacheImpl gfc) {
DiskStoreFactory dsf = gfc.createDiskStoreFactory();
dsf.create(DS_NAME);
+ }
+
+ private Region<Object, Object> createRegion(GemFireCacheImpl gfc) {
+ createDiskStore(gfc);
RegionFactory<Object, Object> 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();
}
}