geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kl...@apache.org
Subject [03/50] [abbrv] incubator-geode git commit: GEODE-898: Fixing a race in SerialWANStatsDUnitTest
Date Mon, 08 Feb 2016 21:58:30 GMT
GEODE-898: Fixing a race in SerialWANStatsDUnitTest

testSerialPropegationConflation was a pausing a sender, but not waiting
for it to pause. It's possible some events could be sent while the pause
was in progress.


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

Branch: refs/heads/feature/GEODE-773-2
Commit: 359a377e2fb1aaaafa5223da049a21e750ed26cd
Parents: 8af4255
Author: Dan Smith <upthewaterspout@apache.org>
Authored: Tue Feb 2 16:42:28 2016 -0800
Committer: Dan Smith <upthewaterspout@apache.org>
Committed: Wed Feb 3 15:50:28 2016 -0800

----------------------------------------------------------------------
 .../internal/cache/wan/serial/SerialWANStatsDUnitTest.java    | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/359a377e/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
----------------------------------------------------------------------
diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
index a142f82..d946d47 100644
--- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
+++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANStatsDUnitTest.java
@@ -537,7 +537,7 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
 
     vm4.invoke(WANTestBase.class, "startSender", new Object[] { "ln" });
 
-    vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" });
+    vm4.invoke(WANTestBase.class, "pauseSenderAndWaitForDispatcherToPause", new Object[]
{ "ln" });
 
     vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] {
         testName, null,1, 100, isOffHeap()  });
@@ -552,7 +552,6 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
     
     vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, keyValues
});
 
-    pause(5000);
     vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()
});
     for(int i=0;i<500;i++) {
       updateKeyValues.put(i, i+"_updated");
@@ -560,8 +559,6 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
     
     vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues
});
 
-    pause(5000);
-    
     vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()
 + updateKeyValues.size() });
 
     vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] {
@@ -569,8 +566,6 @@ public class SerialWANStatsDUnitTest extends WANTestBase {
     
     vm4.invoke(WANTestBase.class, "putGivenKeyValue", new Object[] { testName, updateKeyValues
});
 
-    pause(5000);
-    
     vm4.invoke(WANTestBase.class, "checkQueueSize", new Object[] { "ln", keyValues.size()
 + updateKeyValues.size() });
 
     vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" });


Mime
View raw message