Skip to content

Commit b558567

Browse files
nabarunnagupthewaterspout
authored andcommitted
GEODE-1121: Reduced the memory configurations in the overflow tests.
* Reduced the sender's max memory to 1MB. * Reduced the amount of puts to 5MB. * Introduced a listener to sleep on create event in the receiver to slow down the sender. * Modified the addListenerToSleepOnCreate function signature to take region name as a parameter. This closes #147
1 parent 777c42e commit b558567

4 files changed

Lines changed: 19 additions & 15 deletions

File tree

geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -854,8 +854,8 @@ public static void createCacheInVMs(Integer locatorPort, VM... vms) {
854854
}
855855
}
856856

857-
public static void addListenerToSleepAfterCreateEvent(int milliSeconds) {
858-
cache.getRegion(getTestMethodName() + "_RR_1").getAttributesMutator()
857+
public static void addListenerToSleepAfterCreateEvent(int milliSeconds, final String regionName) {
858+
cache.getRegion(regionName).getAttributesMutator()
859859
.addCacheListener(new CacheListenerAdapter<Object, Object>() {
860860
@Override
861861
public void afterCreate(final EntryEvent<Object, Object> event) {

geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_2_DUnitTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,16 +50,18 @@ public void testSerialReplicatedWanWithOverflow() {
5050

5151
//keep the maxQueueMemory low enough to trigger eviction
5252
vm4.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
53-
false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY ));
53+
false, 10, 5, false, false, null, true, 5, OrderPolicy.KEY ));
5454
vm5.invoke(() -> WANTestBase.createConcurrentSender( "ln", 2,
55-
false, 50, 5, false, false, null, true, 5, OrderPolicy.KEY ));
55+
false, 10, 5, false, false, null, true, 5, OrderPolicy.KEY ));
5656

5757
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
5858
getTestMethodName() + "_RR", null, isOffHeap() ));
5959
vm3.invoke(() -> WANTestBase.createReplicatedRegion(
6060
getTestMethodName() + "_RR", null, isOffHeap() ));
6161

6262
startSenderInVMs("ln", vm4, vm5);
63+
vm2.invoke(() -> addListenerToSleepAfterCreateEvent(1000, getTestMethodName() + "_RR"));
64+
vm3.invoke(() -> addListenerToSleepAfterCreateEvent(1000, getTestMethodName() + "_RR"));
6365

6466
vm4.invoke(() -> WANTestBase.createReplicatedRegion(
6567
getTestMethodName() + "_RR", "ln", isOffHeap() ));
@@ -71,12 +73,12 @@ public void testSerialReplicatedWanWithOverflow() {
7173
getTestMethodName() + "_RR", "ln", isOffHeap() ));
7274

7375
vm4.invoke(() -> WANTestBase.doHeavyPuts(
74-
getTestMethodName() + "_RR", 150 ));
76+
getTestMethodName() + "_RR", 15 ));
7577

7678
vm2.invoke(() -> WANTestBase.validateRegionSize(
77-
getTestMethodName() + "_RR", 150, 240000));
79+
getTestMethodName() + "_RR", 15, 240000));
7880
vm3.invoke(() -> WANTestBase.validateRegionSize(
79-
getTestMethodName() + "_RR", 150, 240000 ));
81+
getTestMethodName() + "_RR", 15, 240000 ));
8082
}
8183

8284
public void Bug46921_testSerialReplicatedWanWithPersistence() {

geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationDUnitTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -785,7 +785,7 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestarted_SenderRec
785785

786786
// create one RR (RR_1) on remote site
787787
vm2.invoke(() -> WANTestBase.createPersistentReplicatedRegion(getTestMethodName() + "_RR_1", null, isOffHeap()));
788-
vm2.invoke(() -> WANTestBase.addListenerToSleepAfterCreateEvent(2000));
788+
vm2.invoke(() -> WANTestBase.addListenerToSleepAfterCreateEvent(2000, getTestMethodName() + "_RR_1"));
789789
// start the senders on local site
790790
startSenderInVMs("ln", vm4, vm5);
791791

@@ -976,8 +976,8 @@ public void testReplicatedSerialPropagationWithRemoteReceiverRestartedOnOtherNod
976976

977977
vm3.invoke(() -> WANTestBase.createPersistentReplicatedRegion(getTestMethodName() + "_RR_1", null, isOffHeap()));
978978

979-
vm2.invoke(() -> addListenerToSleepAfterCreateEvent(2000));
980-
vm3.invoke(() -> addListenerToSleepAfterCreateEvent(2000));
979+
vm2.invoke(() -> addListenerToSleepAfterCreateEvent(2000, getTestMethodName() + "_RR_1"));
980+
vm3.invoke(() -> addListenerToSleepAfterCreateEvent(2000, getTestMethodName() + "_RR_1"));
981981

982982
// create one RR (RR_1) on local site
983983
vm4.invoke(() -> WANTestBase.createReplicatedRegion(getTestMethodName() + "_RR_1", "ln", isOffHeap()));

geode-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/serial/SerialWANPropogationsFeatureDUnitTest.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,18 @@ public void testSerialReplicatedWanWithOverflow() {
3838
createCacheInVMs(lnPort, vm4, vm5, vm6, vm7);
3939

4040
vm4.invoke(() -> WANTestBase.createSender( "ln", 2,
41-
false, 100, 10, false, false, null, true ));
41+
false, 10, 10, false, false, null, true ));
4242
vm5.invoke(() -> WANTestBase.createSender( "ln", 2,
43-
false, 100, 10, false, false, null, true ));
43+
false, 10, 10, false, false, null, true ));
4444

4545
vm2.invoke(() -> WANTestBase.createReplicatedRegion(
4646
getTestMethodName() + "_RR", null, isOffHeap() ));
4747
vm3.invoke(() -> WANTestBase.createReplicatedRegion(
4848
getTestMethodName() + "_RR", null, isOffHeap() ));
4949

5050
startSenderInVMs("ln", vm4, vm5);
51+
vm2.invoke(() -> addListenerToSleepAfterCreateEvent(1000, getTestMethodName() + "_RR"));
52+
vm3.invoke(() -> addListenerToSleepAfterCreateEvent(1000, getTestMethodName() + "_RR"));
5153

5254
vm4.invoke(() -> WANTestBase.createReplicatedRegion(
5355
getTestMethodName() + "_RR", "ln", isOffHeap() ));
@@ -59,12 +61,12 @@ public void testSerialReplicatedWanWithOverflow() {
5961
getTestMethodName() + "_RR", "ln", isOffHeap() ));
6062

6163
vm4.invoke(() -> WANTestBase.doHeavyPuts(
62-
getTestMethodName() + "_RR", 120 ));
64+
getTestMethodName() + "_RR", 15 ));
6365

6466
vm2.invoke(() -> WANTestBase.validateRegionSize(
65-
getTestMethodName() + "_RR", 120, 240000 ));
67+
getTestMethodName() + "_RR", 15, 240000 ));
6668
vm3.invoke(() -> WANTestBase.validateRegionSize(
67-
getTestMethodName() + "_RR", 120, 240000 ));
69+
getTestMethodName() + "_RR", 15, 240000 ));
6870
}
6971

7072
public void testSerialReplicatedWanWithPersistence() {

0 commit comments

Comments
 (0)