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/06/28 00:44:25 UTC
[2/3] incubator-geode git commit: fixed when unit test gets begin
timestamp
fixed when unit test gets begin timestamp
Before it was doing it too late which caused the test
to intermittently fail saying the delay was less than
the expected time.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/104adb94
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/104adb94
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/104adb94
Branch: refs/heads/feature/GEODE-1420
Commit: 104adb94973f893de0c6ddb31ef0e0f3f0ee107a
Parents: 3e00351
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon Jun 27 14:39:27 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Mon Jun 27 14:39:27 2016 -0700
----------------------------------------------------------------------
.../cache/PartitionedRegionDelayedRecoveryDUnitTest.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/104adb94/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
index bdadd8a..1870a19 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionDelayedRecoveryDUnitTest.java
@@ -191,6 +191,8 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends JUnit4CacheTestCa
//create the region in a third VM, which won't have any buckets
vm2.invoke(createPrRegions);
+ final long begin = System.currentTimeMillis();
+
//close 1 cache, which should make the bucket drop below
//the expected redundancy level.
vm1.invoke(new SerializableRunnable("close cache") {
@@ -200,7 +202,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends JUnit4CacheTestCa
}
});
- long elapsed = waitForBucketRecovery(vm2, 1);
+ long elapsed = waitForBucketRecovery(vm2, 1, begin);
assertTrue("Did not wait at least 5 seconds to create the bucket. Elapsed=" + elapsed, elapsed >= 5000);
}
@@ -262,7 +264,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends JUnit4CacheTestCa
+ elapsed, elapsed < 5000);
//wait for the bucket to be copied
- elapsed = waitForBucketRecovery(vm2, 4);
+ elapsed = waitForBucketRecovery(vm2, 4, begin);
assertTrue("Did not wait at least 5 seconds to create the bucket. Elapsed=" + elapsed, elapsed >= 5000);
vm2.invoke(new SerializableCallable("wait for primary move") {
@@ -280,8 +282,7 @@ public class PartitionedRegionDelayedRecoveryDUnitTest extends JUnit4CacheTestCa
});
}
- private long waitForBucketRecovery(VM vm2, final int numBuckets) {
- final long begin = System.currentTimeMillis();
+ private long waitForBucketRecovery(VM vm2, final int numBuckets, final long begin) {
//wait for the bucket to be copied
Long elapsed = (Long) vm2.invoke(new SerializableCallable("putData") {
public Object call() {