You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by kl...@apache.org on 2016/10/13 17:14:51 UTC

[14/20] incubator-geode git commit: GEODE-1978: Slowing down the receivers

GEODE-1978: Slowing down the receivers

	* Slowing down the receivers so that the senders do not complete
	* transmission before the regions are destroyed in the receivers.
	* Removing the flaky test tag


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

Branch: refs/heads/feature/GEODE-1466
Commit: 313bbab5513a9ec01ecf9206955c19d70a8fc26c
Parents: a78fa75
Author: nabarun <nn...@pivotal.io>
Authored: Wed Oct 12 10:04:32 2016 -0700
Committer: nabarun <nn...@pivotal.io>
Committed: Wed Oct 12 12:52:13 2016 -0700

----------------------------------------------------------------------
 .../ConcurrentWANPropagation_1_DUnitTest.java   | 36 +++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/313bbab5/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
index 8bfd8e7..041e3ca 100644
--- a/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
+++ b/geode-wan/src/test/java/org/apache/geode/internal/cache/wan/concurrent/ConcurrentWANPropagation_1_DUnitTest.java
@@ -319,7 +319,6 @@ public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
    * 
    * @throws Exception
    */
-  @Category(FlakyTest.class) // GEODE-1978
   @Test
   public void testReplicatedSerialPropagationWithRemoteRegionDestroy() throws Exception {
     Integer lnPort = (Integer)vm0.invoke(() -> WANTestBase.createFirstLocatorWithDSId( 1 ));
@@ -327,37 +326,40 @@ public class ConcurrentWANPropagation_1_DUnitTest extends WANTestBase {
 
     //these are part of remote site
     createCacheInVMs(nyPort, vm2, vm3);
+
+    //create one RR (RR_1) on remote site
+    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR_1", null, isOffHeap() ));
+    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR_1", null, isOffHeap() ));
+
     createReceiverInVMs(vm2, vm3);
 
+    vm2.invoke(() -> addListenerToSleepAfterCreateEvent(1000,getTestMethodName() + "_RR_1"));
+    vm3.invoke(() -> addListenerToSleepAfterCreateEvent(1000,getTestMethodName() + "_RR_1"));
 
     //these are part of local site
     createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
 
+    //create one RR (RR_1) on local site
+    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
+      getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
+
     //senders are created on local site
     vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
         false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY ));
     vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
         false, 100, 500, false, false, null, true, 5, OrderPolicy.KEY ));
 
-    //create one RR (RR_1) on remote site
-    vm2.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR_1", null, isOffHeap() ));
-    vm3.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR_1", null, isOffHeap() ));
-
     //start the senders on local site
     startSenderInVMs("ln", vm4, vm5);
 
-    //create one RR (RR_1) on local site
-    vm4.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
-    vm5.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
-    vm6.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
-    vm7.invoke(() -> WANTestBase.createReplicatedRegion(
-        getTestMethodName() + "_RR_1", "ln", isOffHeap() ));
-
     IgnoredException.addIgnoredException(BatchException70.class.getName());
     IgnoredException.addIgnoredException(ServerOperationException.class.getName());