http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java index d2796c8..28f370f 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/WANTestBase.java @@ -117,7 +117,7 @@ import com.gemstone.gemfire.pdx.SimpleClass1; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.IgnoredException; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Host; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -735,7 +735,7 @@ public class WANTestBase extends DistributedTestCase{ } else { persistentDirectory = new File(diskStoreName); } - LogWriterSupport.getLogWriter().info("The ds is : " + persistentDirectory.getName()); + LogWriterUtils.getLogWriter().info("The ds is : " + persistentDirectory.getName()); persistentDirectory.mkdir(); DiskStoreFactory dsf = cache.createDiskStoreFactory(); File [] dirs1 = new File[] {persistentDirectory}; @@ -1206,7 +1206,7 @@ public class WANTestBase extends DistributedTestCase{ customerRegion = (PartitionedRegion)cache.createRegionFactory( fact.create()).create(customerRegionName); assertNotNull(customerRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region CUSTOMER created Successfully :" + customerRegion.toString()); @@ -1231,7 +1231,7 @@ public class WANTestBase extends DistributedTestCase{ orderRegion = (PartitionedRegion)cache.createRegionFactory(fact.create()) .create(orderRegionName); assertNotNull(orderRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region ORDER created Successfully :" + orderRegion.toString()); @@ -1256,7 +1256,7 @@ public class WANTestBase extends DistributedTestCase{ shipmentRegion = (PartitionedRegion)cache.createRegionFactory( fact.create()).create(shipmentRegionName); assertNotNull(shipmentRegion); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Partitioned Region SHIPMENT created Successfully :" + shipmentRegion.toString()); } @@ -1366,7 +1366,7 @@ public class WANTestBase extends DistributedTestCase{ boolean gatewaySslRequireAuth = true; Properties gemFireProps = new Properties(); - gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled)); gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols); gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewaySslciphers); @@ -1383,7 +1383,7 @@ public class WANTestBase extends DistributedTestCase{ gemFireProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); gemFireProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); - LogWriterSupport.getLogWriter().info("Starting cache ds with following properties \n" + gemFireProps); + LogWriterUtils.getLogWriter().info("Starting cache ds with following properties \n" + gemFireProps); InternalDistributedSystem ds = test.getSystem(gemFireProps); cache = CacheFactory.create(ds); @@ -2601,7 +2601,7 @@ public class WANTestBase extends DistributedTestCase{ else { persistentDirectory = new File(dsStore); } - LogWriterSupport.getLogWriter().info("The ds is : " + persistentDirectory.getName()); + LogWriterUtils.getLogWriter().info("The ds is : " + persistentDirectory.getName()); persistentDirectory.mkdir(); DiskStoreFactory dsf = cache.createDiskStoreFactory(); @@ -2623,12 +2623,12 @@ public class WANTestBase extends DistributedTestCase{ gateway.setPersistenceEnabled(true); String dsname = dsf.setDiskDirs(dirs1).create(dsName).getName(); gateway.setDiskStoreName(dsname); - LogWriterSupport.getLogWriter().info("The DiskStoreName is : " + dsname); + LogWriterUtils.getLogWriter().info("The DiskStoreName is : " + dsname); } else { DiskStore store = dsf.setDiskDirs(dirs1).create(dsName); gateway.setDiskStoreName(store.getName()); - LogWriterSupport.getLogWriter().info("The ds is : " + store.getName()); + LogWriterUtils.getLogWriter().info("The ds is : " + store.getName()); } gateway.setBatchConflationEnabled(isConflation); gateway.create(dsName, remoteDsId); @@ -2771,7 +2771,7 @@ public class WANTestBase extends DistributedTestCase{ WANTestBase test = new WANTestBase(getTestMethodName()); Properties props = new Properties(); props.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); - props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + props.setProperty(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); props.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); @@ -2789,7 +2789,7 @@ public class WANTestBase extends DistributedTestCase{ fail("Expected GatewayReciever Exception"); } catch (GatewayReceiverException gRE){ - LogWriterSupport.getLogWriter().fine("KBKBKB : got the GatewayReceiverException", gRE); + LogWriterUtils.getLogWriter().fine("KBKBKB : got the GatewayReceiverException", gRE); assertTrue(gRE.getMessage().contains("Failed to create server socket on")); } catch (IOException e) { @@ -2807,7 +2807,7 @@ public class WANTestBase extends DistributedTestCase{ Properties gemFireProps = new Properties(); - gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterSupport.getDUnitLogLevel()); + gemFireProps.put(DistributionConfig.LOG_LEVEL_NAME, LogWriterUtils.getDUnitLogLevel()); gemFireProps.put(DistributionConfig.GATEWAY_SSL_ENABLED_NAME, String.valueOf(gatewaySslenabled)); gemFireProps.put(DistributionConfig.GATEWAY_SSL_PROTOCOLS_NAME, gatewaySslprotocols); gemFireProps.put(DistributionConfig.GATEWAY_SSL_CIPHERS_NAME, gatewaySslciphers); @@ -2824,7 +2824,7 @@ public class WANTestBase extends DistributedTestCase{ gemFireProps.setProperty(DistributionConfig.MCAST_PORT_NAME, "0"); gemFireProps.setProperty(DistributionConfig.LOCATORS_NAME, "localhost[" + locPort + "]"); - LogWriterSupport.getLogWriter().info("Starting cache ds with following properties \n" + gemFireProps); + LogWriterUtils.getLogWriter().info("Starting cache ds with following properties \n" + gemFireProps); InternalDistributedSystem ds = test.getSystem(gemFireProps); cache = CacheFactory.create(ds); @@ -2978,7 +2978,7 @@ public class WANTestBase extends DistributedTestCase{ region = cache.createRegion(regionName, attrs); region.registerInterest("ALL_KEYS"); assertNotNull(region); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Distributed Region " + regionName + " created Successfully :" + region.toString()); } @@ -3228,7 +3228,7 @@ public class WANTestBase extends DistributedTestCase{ "putCustomerPartitionedRegion : failed while doing put operation in CustomerPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Customer :- { " + custid + " : " + customer + " }"); + LogWriterUtils.getLogWriter().info("Customer :- { " + custid + " : " + customer + " }"); } return custKeyValues; } @@ -3254,7 +3254,7 @@ public class WANTestBase extends DistributedTestCase{ "putOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); + LogWriterUtils.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); } return orderKeyValues; } @@ -3277,7 +3277,7 @@ public class WANTestBase extends DistributedTestCase{ "putOrderPartitionedRegionUsingCustId : failed while doing put operation in OrderPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Order :- { " + custid + " : " + order + " }"); + LogWriterUtils.getLogWriter().info("Order :- { " + custid + " : " + order + " }"); } return orderKeyValues; } @@ -3304,7 +3304,7 @@ public class WANTestBase extends DistributedTestCase{ "updateOrderPartitionedRegion : failed while doing put operation in OrderPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); + LogWriterUtils.getLogWriter().info("Order :- { " + orderId + " : " + order + " }"); } } return orderKeyValues; @@ -3327,7 +3327,7 @@ public class WANTestBase extends DistributedTestCase{ "updateOrderPartitionedRegionUsingCustId : failed while doing put operation in OrderPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Order :- { " + custid + " : " + order + " }"); + LogWriterUtils.getLogWriter().info("Order :- { " + custid + " : " + order + " }"); } return orderKeyValues; } @@ -3356,7 +3356,7 @@ public class WANTestBase extends DistributedTestCase{ "putShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Shipment :- { " + shipmentId + " : " + shipment + " }"); } } @@ -3405,7 +3405,7 @@ public class WANTestBase extends DistributedTestCase{ "putShipmentPartitionedRegionUsingCustId : failed while doing put operation in ShipmentPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Shipment :- { " + custid + " : " + shipment + " }"); + LogWriterUtils.getLogWriter().info("Shipment :- { " + custid + " : " + shipment + " }"); } return shipmentKeyValue; } @@ -3434,7 +3434,7 @@ public class WANTestBase extends DistributedTestCase{ "updateShipmentPartitionedRegion : failed while doing put operation in ShipmentPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Shipment :- { " + shipmentId + " : " + shipment + " }"); } } @@ -3459,7 +3459,7 @@ public class WANTestBase extends DistributedTestCase{ "updateShipmentPartitionedRegionUsingCustId : failed while doing put operation in ShipmentPartitionedRegion ", e); } - LogWriterSupport.getLogWriter().info("Shipment :- { " + custid + " : " + shipment + " }"); + LogWriterUtils.getLogWriter().info("Shipment :- { " + custid + " : " + shipment + " }"); } return shipmentKeyValue; } @@ -3884,7 +3884,7 @@ public class WANTestBase extends DistributedTestCase{ for (int bucketId : bucketIds) { List<GatewaySenderEventImpl> eventsForBucket = bucketToEventsMap .get(bucketId); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Events for bucket: " + bucketId + " is " + eventsForBucket); assertNotNull(eventsForBucket); for (int i = 0; i < batchSize; i++) { @@ -3906,7 +3906,7 @@ public class WANTestBase extends DistributedTestCase{ final Map eventsMap = ((MyAsyncEventListener)theListener).getEventsMap(); assertNotNull(eventsMap); - LogWriterSupport.getLogWriter().info("The events map size is " + eventsMap.size()); + LogWriterUtils.getLogWriter().info("The events map size is " + eventsMap.size()); return eventsMap.size(); } @@ -3942,7 +3942,7 @@ public class WANTestBase extends DistributedTestCase{ }; Wait.waitForCriterion(wc, 200000, 500, true); for(int i = 0 ; i < regionSize; i++){ - LogWriterSupport.getLogWriter().info("For Key : Key_"+i + " : Values : " + r.get("Key_" + i)); + LogWriterUtils.getLogWriter().info("For Key : Key_"+i + " : Values : " + r.get("Key_" + i)); assertEquals(new SimpleClass(i, (byte)i), r.get("Key_" + i)); } } @@ -3964,7 +3964,7 @@ public class WANTestBase extends DistributedTestCase{ }; Wait.waitForCriterion(wc, 200000, 500, true); for(int i = 0 ; i < regionSize; i++){ - LogWriterSupport.getLogWriter().info("For Key : Key_"+i + " : Values : " + r.get("Key_" + i)); + LogWriterUtils.getLogWriter().info("For Key : Key_"+i + " : Values : " + r.get("Key_" + i)); assertEquals(new SimpleClass1(false, (short) i, "" + i, i,"" +i ,""+ i,i, i), r.get("Key_" + i)); } } @@ -4047,7 +4047,7 @@ public class WANTestBase extends DistributedTestCase{ public boolean done() { for(Object key: keyValues.keySet()) { if (!r.get(key).equals(keyValues.get(key))) { - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "The values are for key " + " " + key + " " + r.get(key) + " in the map " + keyValues.get(key)); return false; @@ -4209,7 +4209,7 @@ public class WANTestBase extends DistributedTestCase{ } } if (sender.isPrimary()) { - LogWriterSupport.getLogWriter().info("Gateway sender is killed by a test"); + LogWriterUtils.getLogWriter().info("Gateway sender is killed by a test"); cache.getDistributedSystem().disconnect(); return Boolean.TRUE; } @@ -4231,7 +4231,7 @@ public class WANTestBase extends DistributedTestCase{ } } if (queue.isPrimary()) { - LogWriterSupport.getLogWriter().info("AsyncEventQueue is killed by a test"); + LogWriterUtils.getLogWriter().info("AsyncEventQueue is killed by a test"); cache.getDistributedSystem().disconnect(); return Boolean.TRUE; } @@ -4239,10 +4239,10 @@ public class WANTestBase extends DistributedTestCase{ } public static void killSender(){ - LogWriterSupport.getLogWriter().info("Gateway sender is going to be killed by a test"); + LogWriterUtils.getLogWriter().info("Gateway sender is going to be killed by a test"); cache.close(); cache.getDistributedSystem().disconnect(); - LogWriterSupport.getLogWriter().info("Gateway sender is killed by a test"); + LogWriterUtils.getLogWriter().info("Gateway sender is killed by a test"); } static void waitForSitesToUpdate() { @@ -4561,7 +4561,7 @@ public class WANTestBase extends DistributedTestCase{ WaitCriterion wc = new WaitCriterion() { public boolean done() { if (bucket.keySet().size() == 0) { - LogWriterSupport.getLogWriter().info("Bucket " + bucket.getId() + " is empty"); + LogWriterUtils.getLogWriter().info("Bucket " + bucket.getId() + " is empty"); return true; } return false;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java index f1ed833..dbdff58 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderDUnitTest.java @@ -26,7 +26,7 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.internal.cache.wan.parallel.ConcurrentParallelGatewaySenderEventProcessor; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; import java.net.SocketException; @@ -512,7 +512,7 @@ public class ConcurrentParallelGatewaySenderDUnitTest extends WANTestBase { Integer regionSize = (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_PR" }); - LogWriterSupport.getLogWriter().info("Region size on remote is: " + regionSize); + LogWriterUtils.getLogWriter().info("Region size on remote is: " + regionSize); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java index 5d17017..1ed4d1b 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_1_DUnitTest.java @@ -20,7 +20,7 @@ import com.gemstone.gemfire.cache.wan.GatewaySender.OrderPolicy; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; /** @@ -586,12 +586,12 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now started"); + LogWriterUtils.getLogWriter().info("All the senders are now started"); //FIRST RUN: now, the senders are started. So, do some of the puts vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 }); - LogWriterSupport.getLogWriter().info("Done few puts"); + LogWriterUtils.getLogWriter().info("Done few puts"); //now, stop all of the senders vm4.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); @@ -599,28 +599,28 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "stopSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are stopped"); + LogWriterUtils.getLogWriter().info("All the senders are stopped"); Wait.pause(2000); //SECOND RUN: do some of the puts after the senders are stopped vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); - LogWriterSupport.getLogWriter().info("Done some more puts in second run"); + LogWriterUtils.getLogWriter().info("Done some more puts in second run"); //Region size on remote site should remain same and below the number of puts done in the FIRST RUN vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 200 }); //SECOND RUN: start async puts on region AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 }); - LogWriterSupport.getLogWriter().info("Started high number of puts by async thread"); + LogWriterUtils.getLogWriter().info("Started high number of puts by async thread"); - LogWriterSupport.getLogWriter().info("Starting the senders at the same time"); + LogWriterUtils.getLogWriter().info("Starting the senders at the same time"); //when puts are happening by another thread, start the senders vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are started"); + LogWriterUtils.getLogWriter().info("All the senders are started"); async.join(); @@ -752,7 +752,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created cache on local site"); + LogWriterUtils.getLogWriter().info("Created cache on local site"); vm4.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY }); @@ -763,7 +763,7 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "createConcurrentSender", new Object[] { "ln", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY }); - LogWriterSupport.getLogWriter().info("Created senders on local site"); + LogWriterUtils.getLogWriter().info("Created senders on local site"); vm4.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); @@ -774,16 +774,16 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm7.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName() + "_PR", "ln", 1, 100, isOffHeap() }); - LogWriterSupport.getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); vm3.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName() + "_PR", null, 1, 100, isOffHeap() }); - LogWriterSupport.getLogWriter().info("Created PRs on remote site"); + LogWriterUtils.getLogWriter().info("Created PRs on remote site"); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); - LogWriterSupport.getLogWriter().info("Done 1000 puts on local site"); + LogWriterUtils.getLogWriter().info("Done 1000 puts on local site"); //Since puts are already done on userPR, it will have the buckets created. //During sender start, it will wait until those buckets are created for shadowPR as well. @@ -799,16 +799,16 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Started senders on local site"); + LogWriterUtils.getLogWriter().info("Started senders on local site"); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 }); - LogWriterSupport.getLogWriter().info("Done 5000 puts on local site"); + LogWriterUtils.getLogWriter().info("Done 5000 puts on local site"); vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Paused senders on local site"); + LogWriterUtils.getLogWriter().info("Paused senders on local site"); vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" }); @@ -817,13 +817,13 @@ public class ConcurrentParallelGatewaySenderOperation_1_DUnitTest extends WANTes AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); - LogWriterSupport.getLogWriter().info("Started 1000 async puts on local site"); + LogWriterUtils.getLogWriter().info("Started 1000 async puts on local site"); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Resumed senders on local site"); + LogWriterUtils.getLogWriter().info("Resumed senders on local site"); vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java index 8f92810..4e74822 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentParallelGatewaySenderOperation_2_DUnitTest.java @@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -242,7 +242,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes try { vm7.invoke(() -> createCache_INFINITE_MAXIMUM_SHUTDOWN_WAIT_TIME(lnPort)); - LogWriterSupport.getLogWriter().info("Created cache on local site"); + LogWriterUtils.getLogWriter().info("Created cache on local site"); vm7.invoke(() -> createConcurrentSender("ln1", 2, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY)); vm7.invoke(() -> createConcurrentSender("ln2", 3, true, 100, 10, false, false, null, true, 5, OrderPolicy.KEY)); @@ -255,7 +255,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes String regionName = getTestMethodName() + "_PR"; vm7.invoke(() -> createPartitionedRegion(regionName, "ln1,ln2,ln3", 1, 10, isOffHeap())); - LogWriterSupport.getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm4.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap())); vm5.invoke(() -> createPartitionedRegion(regionName, null, 1, 10, isOffHeap())); @@ -380,7 +380,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 5, true); createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 5, true); - LogWriterSupport.getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm2.invoke(() -> createCustomerOrderShipmentPartitionedRegion(null, null, 1, 100, isOffHeap())); @@ -418,7 +418,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes createAndStartSenderWithCustomerOrderShipmentRegion(vm4, lnPort, 6, true); createAndStartSenderWithCustomerOrderShipmentRegion(vm5, lnPort, 6, true); - LogWriterSupport.getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); vm2.invoke(WANTestBase.class, "createCustomerOrderShipmentPartitionedRegion", new Object[] { null, @@ -486,7 +486,7 @@ public class ConcurrentParallelGatewaySenderOperation_2_DUnitTest extends WANTes vm.invoke(() -> pauseSender("ln")); } vm.invoke(() -> createPartitionedRegion(getTestMethodName() + "_PR", "ln", 1, 10, isOffHeap())); - LogWriterSupport.getLogWriter().info("Created PRs on local site"); + LogWriterUtils.getLogWriter().info("Created PRs on local site"); } protected void createReceiverAndDoPutsInPausedSender(int port) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java index 1248417..c6123be 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/concurrent/ConcurrentWANPropogation_1_DUnitTest.java @@ -25,7 +25,7 @@ import com.gemstone.gemfire.internal.cache.wan.BatchException70; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; /** * All the test cases are similar to SerialWANPropogationDUnitTest except that @@ -202,7 +202,7 @@ public class ConcurrentWANPropogation_1_DUnitTest extends WANTestBase { Integer regionSize = (Integer) vm2.invoke(WANTestBase.class, "getRegionSize", new Object[] {getTestMethodName() + "_RR" }); - LogWriterSupport.getLogWriter().info("Region size on remote is: " + regionSize); + LogWriterUtils.getLogWriter().info("Region size on remote is: " + regionSize); vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java index b5d15fe..86018c6 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/disttx/DistTXWANDUnitTest.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.internal.cache.ForceReattemptException; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Invoke; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableCallable; public class DistTXWANDUnitTest extends WANTestBase { @@ -39,7 +39,7 @@ public class DistTXWANDUnitTest extends WANTestBase { Invoke.invokeInEveryVM(new SerializableCallable() { @Override public Object call() throws Exception { - System.setProperty("gemfire.log-level", LogWriterSupport.getDUnitLogLevel()); + System.setProperty("gemfire.log-level", LogWriterUtils.getDUnitLogLevel()); return null; } }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java index 1cd6846..6be5b97 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/CommonParallelGatewaySenderDUnitTest.java @@ -28,7 +28,7 @@ import com.gemstone.gemfire.internal.cache.wan.parallel.ParallelGatewaySenderQue import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; import com.gemstone.gemfire.test.dunit.WaitCriterion; @@ -287,7 +287,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); //create PR on remote site vm2.invoke(WANTestBase.class, "createPartitionedRegion", new Object[] { @@ -343,7 +343,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName()+"PR1", 3000 }); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName()+"PR2", 5000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -352,7 +352,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "killSender", new Object[] {}); vm7.invoke(WANTestBase.class, "killSender", new Object[] {}); - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -360,7 +360,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -372,7 +372,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createPartitionedRegion", new Object[] { getTestMethodName()+"PR1", "ln", 1, 100, isOffHeap() }); @@ -412,7 +412,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { fail(); } - LogWriterSupport.getLogWriter().info("Created back the partitioned regions"); + LogWriterUtils.getLogWriter().info("Created back the partitioned regions"); //start the senders in async mode. This will ensure that the //node of shadow PR that went down last will come up first @@ -421,14 +421,14 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -463,7 +463,7 @@ public class CommonParallelGatewaySenderDUnitTest extends WANTestBase { WaitCriterion wc = new WaitCriterion() { public boolean done() { if (bucket.keySet().size() == 0) { - LogWriterSupport.getLogWriter().info("Bucket " + bucket.getId() + " is empty"); + LogWriterUtils.getLogWriter().info("Bucket " + bucket.getId() + " is empty"); return true; } return false; http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java index eab7004..4b5fb00 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/NewWANConcurrencyCheckForDestroyDUnitTest.java @@ -31,7 +31,7 @@ import com.gemstone.gemfire.internal.cache.Token.Tombstone; import com.gemstone.gemfire.internal.cache.versions.VersionTag; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; /** @@ -82,7 +82,7 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase { "createFirstRemoteLocator", new Object[] { 3, lnPort }); Integer tkRecPort = (Integer) vm5.invoke(WANTestBase.class, "createReceiver", new Object[] { tkPort }); - LogWriterSupport.getLogWriter().info("Created locators and receivers in 3 distributed systems"); + LogWriterUtils.getLogWriter().info("Created locators and receivers in 3 distributed systems"); //Site 1 vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, @@ -162,7 +162,7 @@ public class NewWANConcurrencyCheckForDestroyDUnitTest extends WANTestBase { "createFirstRemoteLocator", new Object[] { 2, lnPort }); Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - LogWriterSupport.getLogWriter().info("Created locators and receivers in 2 distributed systems"); + LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems"); //Site 1 vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, @@ -267,7 +267,7 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { "createFirstRemoteLocator", new Object[] { 2, lnPort }); Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - LogWriterSupport.getLogWriter().info("Created locators and receivers in 2 distributed systems"); + LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems"); //Site 1 vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, @@ -374,7 +374,7 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { "createFirstRemoteLocator", new Object[] { 2, lnPort }); Integer nyRecPort = (Integer) vm3.invoke(WANTestBase.class, "createReceiver", new Object[] { nyPort }); - LogWriterSupport.getLogWriter().info("Created locators and receivers in 2 distributed systems"); + LogWriterUtils.getLogWriter().info("Created locators and receivers in 2 distributed systems"); //Site 1 vm1.invoke(WANTestBase.class, "createSender", new Object[] { "ln1", 2, @@ -483,7 +483,7 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { re = ((NonTXEntry)entry).getRegionEntry(); } if (re != null) { - LogWriterSupport.getLogWriter().fine("RegionEntry for testKey: " + re.getKey() + " " + re.getValueInVM((LocalRegion) region)); + LogWriterUtils.getLogWriter().fine("RegionEntry for testKey: " + re.getKey() + " " + re.getValueInVM((LocalRegion) region)); VersionTag tag = re.getVersionStamp().asVersionTag(); return tag.getVersionTimeStamp(); @@ -503,7 +503,7 @@ public void testPutAllEventSequenceOnSerialGatewaySenderWithPR() { Region.Entry entry = ((LocalRegion)region).getEntry("testKey", /*null,*/ true); RegionEntry re = ((EntrySnapshot)entry).getRegionEntry(); - LogWriterSupport.getLogWriter().fine("RegionEntry for testKey: " + re.getKey() + " " + re.getValueInVM((LocalRegion) region)); + LogWriterUtils.getLogWriter().fine("RegionEntry for testKey: " + re.getKey() + " " + re.getValueInVM((LocalRegion) region)); assertTrue(re.getValueInVM((LocalRegion) region) instanceof Tombstone); VersionTag tag = re.getVersionStamp().asVersionTag(); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java index 4d52811..b990a22 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPersistenceDUnitTest.java @@ -22,7 +22,7 @@ import com.gemstone.gemfire.cache.Scope; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBase { @@ -77,7 +77,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", isOffHeap() }); @@ -105,7 +105,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -121,7 +121,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas exp1.remove(); } */ - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -129,7 +129,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -141,7 +141,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] { @@ -169,14 +169,14 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR", 3000 }); @@ -234,7 +234,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", @@ -266,7 +266,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -288,7 +288,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -300,7 +300,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] { @@ -329,14 +329,14 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -414,7 +414,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas String diskStore4 = (String) vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); + LogWriterUtils.getLogWriter().info("The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); vm4.invoke(WANTestBase.class, "createReplicatedRegion", new Object[] { getTestMethodName() + "_RR", "ln", Scope.DISTRIBUTED_ACK, @@ -456,7 +456,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas //start puts in region on local site vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_RR", 3000 }); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 3000 }); - LogWriterSupport.getLogWriter().info("Completed puts in the region"); + LogWriterUtils.getLogWriter().info("Completed puts in the region"); //--------------------close and rebuild local site ------------------------------------------------- //kill the senders @@ -472,7 +472,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas exp1.remove(); } */ - LogWriterSupport.getLogWriter().info("Killed all the senders."); + LogWriterUtils.getLogWriter().info("Killed all the senders."); //restart the vm vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); @@ -480,7 +480,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm6.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm7.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); //create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", @@ -492,7 +492,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm7.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore4, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); //create PR on local site AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createReplicatedRegion", new Object[] { @@ -545,14 +545,14 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); //wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are now running..."); + LogWriterUtils.getLogWriter().info("All the senders are now running..."); //---------------------------------------------------------------------------------------------------- @@ -642,7 +642,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, null, true }); - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "The DS are: " + diskStore1 + "," + diskStore2 + "," + diskStore3 + "," + diskStore4); @@ -704,7 +704,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm4.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); vm5.invoke(WANTestBase.class, "createCache", new Object[] { lnPort }); - LogWriterSupport.getLogWriter().info("Created back the cache"); + LogWriterUtils.getLogWriter().info("Created back the cache"); // create senders with disk store vm4.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { @@ -712,7 +712,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm5.invoke(WANTestBase.class, "createSenderWithDiskStore", new Object[] { "ln", 2, true, 100, 10, false, true, null, diskStore2, true }); - LogWriterSupport.getLogWriter().info("Created the senders back from the disk store."); + LogWriterUtils.getLogWriter().info("Created the senders back from the disk store."); AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "createReplicatedRegion", @@ -737,7 +737,7 @@ public class ReplicatedRegion_ParallelWANPersistenceDUnitTest extends WANTestBas vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Waiting for senders running."); + LogWriterUtils.getLogWriter().info("Waiting for senders running."); // wait for senders running vm4.invoke(WANTestBase.class, "waitForSenderRunningState", new Object[] { "ln" }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java index 18b1109..6c451a3 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ReplicatedRegion_ParallelWANPropogationDUnitTest.java @@ -44,7 +44,7 @@ import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.Wait; public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBase{ @@ -954,7 +954,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas Integer size = (Integer)vm4.invoke(WANTestBase.class, "getQueueContentSize", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("The size of the queue is in vm4 " + size); + LogWriterUtils.getLogWriter().info("The size of the queue is in vm4 " + size); vm4.invoke(WANTestBase.class, @@ -962,7 +962,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas size = (Integer)vm4.invoke(WANTestBase.class, "getQueueContentSize", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("The size of the queue is in vm4 " + size); + LogWriterUtils.getLogWriter().info("The size of the queue is in vm4 " + size); vm2.invoke(WANTestBase.class, "validateRegionSize", new Object[] { getTestMethodName() + "_RR", 1000 }); @@ -1076,7 +1076,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas Region r = cache.getRegion(Region.SEPARATOR + regionName); assertNotNull(r); for (long i = 0; i < numPuts; i++) { - LogWriterSupport.getLogWriter().info("Put : key : " + i); + LogWriterUtils.getLogWriter().info("Put : key : " + i); r.put(i, "0_" + i); } } finally { @@ -1095,7 +1095,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas Region r = cache.getRegion(Region.SEPARATOR + regionName); assertNotNull(r); for (long i = 0; i < numPuts; i++) { - LogWriterSupport.getLogWriter().info("Put : key : " + i); + LogWriterUtils.getLogWriter().info("Put : key : " + i); r.put(i, "1_" + i); } } finally { @@ -1113,7 +1113,7 @@ public class ReplicatedRegion_ParallelWANPropogationDUnitTest extends WANTestBas Region r = cache.getRegion(Region.SEPARATOR + regionName); assertNotNull(r); for (long i = 0; i < numPuts; i++) { - LogWriterSupport.getLogWriter().info("Put : key : " + i); + LogWriterUtils.getLogWriter().info("Put : key : " + i); r.put(i, "2_" + i); } } finally { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java index 4425c4e..c5100f9 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/ShutdownAllPersistentGatewaySenderDUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.SerializableRunnable; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -117,7 +117,7 @@ public class ShutdownAllPersistentGatewaySenderDUnitTest extends WANTestBase { future.join(MAX_WAIT); // now restart vm1 with gatewayHub - LogWriterSupport.getLogWriter().info("restart in VM2"); + LogWriterUtils.getLogWriter().info("restart in VM2"); vm2.invoke(WANTestBase.class, "createCache", new Object[] { nyPort }); vm3.invoke(WANTestBase.class, "createCache", new Object[] { nyPort }); AsyncInvocation vm3_future = vm3.invokeAsync(WANTestBase.class, http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java index 9798739..d239cf4 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WANLocatorServerDUnitTest.java @@ -37,7 +37,7 @@ import com.gemstone.gemfire.internal.cache.PoolFactoryImpl; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; public class WANLocatorServerDUnitTest extends WANTestBase { @@ -151,7 +151,7 @@ public class WANLocatorServerDUnitTest extends WANTestBase { fail("Test " + test.getName() + " failed to start CacheServer on port " + port); } - LogWriterSupport.getLogWriter().info( + LogWriterUtils.getLogWriter().info( "Server Started on port : " + port + " : server : " + server); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java index 6a8acb2..459b718 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/misc/WanAutoDiscoveryDUnitTest.java @@ -30,7 +30,7 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.Assert; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.Host; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; public class WanAutoDiscoveryDUnitTest extends WANTestBase { @@ -458,7 +458,7 @@ public class WanAutoDiscoveryDUnitTest extends WANTestBase { Assert.fail("Could not get end time", e); } - LogWriterSupport.getLogWriter().info("Time taken for all 9 locators discovery in 3 sites: " + (endTime.longValue() - startTime)); + LogWriterUtils.getLogWriter().info("Time taken for all 9 locators discovery in 3 sites: " + (endTime.longValue() - startTime)); vm0.invoke(WANTestBase.class, "checkAllSiteMetaDataFor3Sites", new Object[] { dsVsPort }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java index 3faae76..8dbf2f7 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderOperationsDUnitTest.java @@ -24,7 +24,7 @@ import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.AsyncInvocation; import com.gemstone.gemfire.test.dunit.DistributedTestCase; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.RMIException; import com.gemstone.gemfire.test.dunit.Wait; @@ -318,38 +318,38 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase { //make sure all the senders are running before doing any puts waitForSendersRunning(); - LogWriterSupport.getLogWriter().info("All the senders are now started"); + LogWriterUtils.getLogWriter().info("All the senders are now started"); //FIRST RUN: now, the senders are started. So, do some of the puts vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 200 }); - LogWriterSupport.getLogWriter().info("Done few puts"); + LogWriterUtils.getLogWriter().info("Done few puts"); //now, stop all of the senders stopSenders(); - LogWriterSupport.getLogWriter().info("All the senders are stopped"); + LogWriterUtils.getLogWriter().info("All the senders are stopped"); Wait.pause(2000); //SECOND RUN: do some of the puts after the senders are stopped vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); - LogWriterSupport.getLogWriter().info("Done some more puts in second run"); + LogWriterUtils.getLogWriter().info("Done some more puts in second run"); //Region size on remote site should remain same and below the number of puts done in the FIRST RUN vm2.invoke(WANTestBase.class, "validateRegionSizeRemainsSame", new Object[] {getTestMethodName() + "_PR", 200 }); //SECOND RUN: start async puts on region AsyncInvocation async = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 }); - LogWriterSupport.getLogWriter().info("Started high number of puts by async thread"); + LogWriterUtils.getLogWriter().info("Started high number of puts by async thread"); - LogWriterSupport.getLogWriter().info("Starting the senders at the same time"); + LogWriterUtils.getLogWriter().info("Starting the senders at the same time"); //when puts are happening by another thread, start the senders vm4.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm5.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm6.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); vm7.invokeAsync(WANTestBase.class, "startSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("All the senders are started"); + LogWriterUtils.getLogWriter().info("All the senders are started"); async.join(); @@ -424,7 +424,7 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase { createSendersReceiversAndPartitionedRegion(lnPort, nyPort, false, true); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); - LogWriterSupport.getLogWriter().info("Done 1000 puts on local site"); + LogWriterUtils.getLogWriter().info("Done 1000 puts on local site"); //Since puts are already done on userPR, it will have the buckets created. //During sender start, it will wait until those buckets are created for shadowPR as well. @@ -437,16 +437,16 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase { waitForSendersRunning(); - LogWriterSupport.getLogWriter().info("Started senders on local site"); + LogWriterUtils.getLogWriter().info("Started senders on local site"); vm4.invoke(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 5000 }); - LogWriterSupport.getLogWriter().info("Done 5000 puts on local site"); + LogWriterUtils.getLogWriter().info("Done 5000 puts on local site"); vm4.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "pauseSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Paused senders on local site"); + LogWriterUtils.getLogWriter().info("Paused senders on local site"); vm4.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "verifySenderPausedState", new Object[] { "ln" }); @@ -455,13 +455,13 @@ public class ParallelGatewaySenderOperationsDUnitTest extends WANTestBase { AsyncInvocation inv1 = vm4.invokeAsync(WANTestBase.class, "doPuts", new Object[] { getTestMethodName() + "_PR", 1000 }); - LogWriterSupport.getLogWriter().info("Started 1000 async puts on local site"); + LogWriterUtils.getLogWriter().info("Started 1000 async puts on local site"); vm4.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm6.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); vm7.invoke(WANTestBase.class, "resumeSender", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Resumed senders on local site"); + LogWriterUtils.getLogWriter().info("Resumed senders on local site"); vm4.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" }); vm5.invoke(WANTestBase.class, "verifySenderResumedState", new Object[] { "ln" }); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c05f6798/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java index c90d696..ee38f5a 100644 --- a/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java +++ b/gemfire-wan/src/test/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelGatewaySenderQueueOverflowDUnitTest.java @@ -39,7 +39,7 @@ import com.gemstone.gemfire.internal.cache.RegionQueue; import com.gemstone.gemfire.internal.cache.wan.AbstractGatewaySender; import com.gemstone.gemfire.internal.cache.wan.WANTestBase; import com.gemstone.gemfire.test.dunit.IgnoredException; -import com.gemstone.gemfire.test.dunit.LogWriterSupport; +import com.gemstone.gemfire.test.dunit.LogWriterUtils; import com.gemstone.gemfire.test.dunit.VM; import com.gemstone.gemfire.test.dunit.Wait; @@ -124,8 +124,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); - LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); + LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); + LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; //considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk. @@ -212,8 +212,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); - LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); + LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); + LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; //considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk. @@ -301,8 +301,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); - LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); + LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); + LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; //considering a memory limit of 40 MB, maximum of 40 events can be in memory. Rest should be on disk. @@ -390,8 +390,8 @@ public class ParallelGatewaySenderQueueOverflowDUnitTest extends WANTestBase { long numMemVm6 = (Long) vm6.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); long numMemVm7 = (Long) vm7.invoke(WANTestBase.class, "getNumberOfEntriesInVM", new Object[] { "ln" }); - LogWriterSupport.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); - LogWriterSupport.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); + LogWriterUtils.getLogWriter().info("Entries overflown to disk: " + numOvVm4 + "," + numOvVm5 + "," + numOvVm6 + "," + numOvVm7); + LogWriterUtils.getLogWriter().info("Entries in VM: " + numMemVm4 + "," + numMemVm5 + "," + numMemVm6 + "," + numMemVm7); long totalOverflown = numOvVm4 + numOvVm5 + numOvVm6 + numOvVm7; //all 30 (considering redundant copies) events should accommodate in 40 MB space given to 4 senders
