geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bschucha...@apache.org
Subject incubator-geode git commit: Geode-561: DistributedNoAckRegionCCEDUnitTest.testTombstones
Date Fri, 08 Jan 2016 23:06:19 GMT
Repository: incubator-geode
Updated Branches:
  refs/heads/develop 0c0850cb6 -> 871266ce2


Geode-561: DistributedNoAckRegionCCEDUnitTest.testTombstones

Due to the batched nature of tombstone garbage-collection it's possible
that only a small portion of the tombstones in this test will be removed.
The test has been changed to stop expecting that all tombstones will
be removed.


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

Branch: refs/heads/develop
Commit: 871266ce214354a7c7267f89dea6f56af103fe21
Parents: 0c0850c
Author: Bruce Schuchardt <bschuchardt@pivotal.io>
Authored: Fri Jan 8 15:03:43 2016 -0800
Committer: Bruce Schuchardt <bschuchardt@pivotal.io>
Committed: Fri Jan 8 15:06:06 2016 -0800

----------------------------------------------------------------------
 .../com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/871266ce/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
----------------------------------------------------------------------
diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
index b995494..ce9cfbf 100644
--- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
+++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache30/MultiVMRegionTestCase.java
@@ -8494,14 +8494,16 @@ public abstract class MultiVMRegionTestCase extends RegionTestCase
{
         public void run() {
           final long count = CCRegion.getTombstoneCount();
           assertEquals("expected "+numEntries+" tombstones", numEntries, count);
+          // ensure that some GC is performed - due to timing it may not
+          // be the whole batch, but some amount should be done
           WaitCriterion waitForExpiration = new WaitCriterion() {
             @Override
             public boolean done() {
-              return CCRegion.getTombstoneCount() ==  0;
+              return CCRegion.getTombstoneCount() < numEntries;
             }
             @Override
             public String description() {
-              return "Waiting for all tombstones to expire.  There are now " + CCRegion.getTombstoneCount()
+              return "Waiting for some tombstones to expire.  There are now " + CCRegion.getTombstoneCount()
                 + " tombstones left out of " + count + " initial tombstones";
             }
           };


Mime
View raw message