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/05/11 17:19:56 UTC
[1/6] incubator-geode git commit: GEODE-1360: Enabling to specify
log4j2.xml for test in gradle
Repository: incubator-geode
Updated Branches:
refs/heads/feature/GEODE-1376 b9b0757fa -> c3906859a
GEODE-1360: Enabling to specify log4j2.xml for test in gradle
Product code has built in log4j's trace log. However there's no command line
parameter to turn on it. This fix let gradlew to transfer the system property
to unit test framework, and let unit test framework to set it in run-time jvm.
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/036c9317
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/036c9317
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/036c9317
Branch: refs/heads/feature/GEODE-1376
Commit: 036c931705fab5122a81a446d67e4ab5bc6620b7
Parents: 9a77054
Author: zhouxh <gz...@pivotal.io>
Authored: Mon May 9 17:03:15 2016 -0700
Committer: zhouxh <gz...@pivotal.io>
Committed: Tue May 10 14:21:39 2016 -0700
----------------------------------------------------------------------
.../test/dunit/standalone/DUnitLauncher.java | 2 +
.../test/dunit/standalone/ProcessManager.java | 45 ++++++++++++--------
gradle/test.gradle | 4 ++
3 files changed, 34 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/036c9317/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
index 0c294ec..4e7095c 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
@@ -76,6 +76,8 @@ public class DUnitLauncher {
/** change this to use a different log level in unit tests */
public static final String LOG_LEVEL = System.getProperty("logLevel", "info");
+ public static final String LOG4J = System.getProperty("log4j.configurationFile");
+
static int locatorPort;
private static final int NUM_VMS = 4;
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/036c9317/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
index dd532c4..5dbdfd6 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/ProcessManager.java
@@ -28,6 +28,7 @@ import java.rmi.AccessException;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
import java.rmi.registry.Registry;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
@@ -161,23 +162,33 @@ public class ProcessManager {
}
String jdkSuspend = vmNum == suspendVM ? "y" : "n";
-
- return new String[] {
- cmd, "-classpath", classPath,
- "-D" + DUnitLauncher.RMI_PORT_PARAM + "=" + namingPort,
- "-D" + DUnitLauncher.VM_NUM_PARAM + "=" + vmNum,
- "-D" + DUnitLauncher.WORKSPACE_DIR_PARAM + "=" + new File(".").getAbsolutePath(),
- "-DlogLevel=" + DUnitLauncher.LOG_LEVEL,
- "-Djava.library.path=" + System.getProperty("java.library.path"),
- "-Xrunjdwp:transport=dt_socket,server=y,suspend=" + jdkSuspend + jdkDebug,
- "-XX:+HeapDumpOnOutOfMemoryError",
- "-Xmx512m",
- "-Dgemfire.DEFAULT_MAX_OPLOG_SIZE=10",
- "-Dgemfire.disallowMcastDefaults=true",
- "-ea", "-XX:+PrintGC", "-XX:+PrintGCDetails","-XX:+PrintGCTimeStamps",
- agent,
- ChildVM.class.getName()
- };
+ ArrayList<String> cmds = new ArrayList<String>();
+ cmds.add(cmd);
+ cmds.add("-classpath");
+ cmds.add(classPath);
+ cmds.add("-D" + DUnitLauncher.RMI_PORT_PARAM + "=" + namingPort);
+ cmds.add("-D" + DUnitLauncher.VM_NUM_PARAM + "=" + vmNum);
+ cmds.add("-D" + DUnitLauncher.WORKSPACE_DIR_PARAM + "=" + new File(".").getAbsolutePath());
+ cmds.add("-DlogLevel=" + DUnitLauncher.LOG_LEVEL);
+ if (DUnitLauncher.LOG4J!=null) {
+ cmds.add("-Dlog4j.configurationFile="+DUnitLauncher.LOG4J);
+ }
+ cmds.add("-Djava.library.path=" + System.getProperty("java.library.path"));
+ cmds.add("-Xrunjdwp:transport=dt_socket,server=y,suspend=" + jdkSuspend + jdkDebug);
+ cmds.add("-XX:+HeapDumpOnOutOfMemoryError");
+ cmds.add("-Xmx512m");
+ cmds.add("-Dgemfire.DEFAULT_MAX_OPLOG_SIZE=10");
+ cmds.add("-Dgemfire.disallowMcastDefaults=true");
+ cmds.add("-ea");
+ cmds.add("-XX:+PrintGC");
+ cmds.add("-XX:+PrintGCDetails");
+ cmds.add("-XX:+PrintGCTimeStamps");
+ cmds.add(agent);
+ cmds.add(ChildVM.class.getName());
+ String[] rst = new String[cmds.size()];
+ cmds.toArray(rst);
+
+ return rst;
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/036c9317/gradle/test.gradle
----------------------------------------------------------------------
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 2dd7521..96fbfc5 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -211,6 +211,10 @@ subprojects {
if (logLevel != null) {
systemProperty 'logLevel', logLevel
}
+ def log4jLocation = System.getProperty('log4j.configurationFile')
+ if (log4jLocation != null) {
+ systemProperty 'log4j.configurationFile', log4jLocation
+ }
def eol = System.getProperty('line.separator')
def progress = new File(resultsDir, "$test.name-progress.txt")
[3/6] incubator-geode git commit: GEODE-1370: restore name of
destroySharedConfiguration_forTestsOnly
Posted by kl...@apache.org.
GEODE-1370: restore name of destroySharedConfiguration_forTestsOnly
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/9d28009f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/9d28009f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/9d28009f
Branch: refs/heads/feature/GEODE-1376
Commit: 9d28009f1018bba74dab671c64ee42e8b4a25899
Parents: fe69f0a
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 11 09:56:07 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 11 09:56:07 2016 -0700
----------------------------------------------------------------------
.../gemfire/distributed/internal/SharedConfiguration.java | 2 +-
.../internal/configuration/SharedConfigurationDUnitTest.java | 2 +-
.../internal/configuration/SharedConfigurationTestUtils.java | 2 +-
.../configuration/SharedConfigurationUsingDirDUnitTest.java | 3 +--
4 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
index 0f349e9..ba9c7dc 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/distributed/internal/SharedConfiguration.java
@@ -406,7 +406,7 @@ public class SharedConfiguration {
* <p/>
* Throws {@code AssertionError} wrapping any exception thrown by operation.
*/
- public void destroySharedConfiguration_forTestsOnly() {
+ public void destroySharedConfiguration() {
try {
Region<String, Configuration> configRegion = getConfigurationRegion();
if (configRegion != null) {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
index c07eab7..f0c685b 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationDUnitTest.java
@@ -187,7 +187,7 @@ public class SharedConfigurationDUnitTest extends JUnit4CacheTestCase {
public Object call() {
InternalLocator locator = (InternalLocator) Locator.getLocator();
SharedConfiguration sharedConfig = locator.getSharedConfiguration();
- sharedConfig.destroySharedConfiguration_forTestsOnly();
+ sharedConfig.destroySharedConfiguration();
locator.stop();
return null;
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
index 235f02e..1174c7d 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationTestUtils.java
@@ -30,7 +30,7 @@ public class SharedConfigurationTestUtils {
if (locator != null) {
SharedConfiguration sharedConfig = locator.getSharedConfiguration();
if (sharedConfig != null) {
- sharedConfig.destroySharedConfiguration_forTestsOnly();
+ sharedConfig.destroySharedConfiguration();
}
locator.stop();
}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/9d28009f/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
index 9cbb12c..8f80877 100644
--- a/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/management/internal/configuration/SharedConfigurationUsingDirDUnitTest.java
@@ -33,7 +33,6 @@ import java.util.Arrays;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
-import org.junit.After;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -62,7 +61,7 @@ public class SharedConfigurationUsingDirDUnitTest extends JUnit4CacheTestCase {
SharedConfiguration sharedConfig = locator.getSharedConfiguration();
if (sharedConfig != null) {
- sharedConfig.destroySharedConfiguration_forTestsOnly();
+ sharedConfig.destroySharedConfiguration();
}
});
}
[2/6] incubator-geode git commit: GEODE-699 CI failure
PartitionedRegionSingleHopDUnitTest.test_MetadataServiceCallAccuracy
Posted by kl...@apache.org.
GEODE-699 CI failure
PartitionedRegionSingleHopDUnitTest.test_MetadataServiceCallAccuracy
Replace WaitCriterion with Awaitility
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fe69f0a8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fe69f0a8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fe69f0a8
Branch: refs/heads/feature/GEODE-1376
Commit: fe69f0a8a40a2825c979dab01b66f1c1d5a0b974
Parents: 036c931
Author: Jianxia Chen <jc...@pivotal.io>
Authored: Wed May 11 09:52:26 2016 -0700
Committer: Jianxia Chen <jc...@pivotal.io>
Committed: Wed May 11 09:52:26 2016 -0700
----------------------------------------------------------------------
.../PartitionedRegionSingleHopDUnitTest.java | 441 ++++++-------------
1 file changed, 139 insertions(+), 302 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fe69f0a8/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
----------------------------------------------------------------------
diff --git a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
index 399f1ca..f79d6c6 100755
--- a/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
+++ b/geode-core/src/test/java/com/gemstone/gemfire/internal/cache/PartitionedRegionSingleHopDUnitTest.java
@@ -29,7 +29,10 @@ import java.util.Map.Entry;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import com.jayway.awaitility.Awaitility;
+import org.jgroups.blocks.locking.AwaitInfo;
import org.junit.Ignore;
import org.junit.experimental.categories.Category;
@@ -105,7 +108,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
private static Cache cache = null;
private static Locator locator = null;
-
+
public PartitionedRegionSingleHopDUnitTest(String name) {
super(name);
}
@@ -124,7 +127,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
public final void postTearDownCacheTestCase() throws Exception {
try {
closeCacheAndDisconnect();
-
+
member0 = null;
member1 = null;
member2 = null;
@@ -148,7 +151,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
cacheServer.stop();
}
}
-
+
public static void startLocatorInVM(final int locatorPort) {
File logFile = new File("locator-" + locatorPort + ".log");
@@ -380,44 +383,21 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView());
final ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.satisfyRefreshMetadata_TEST_ONLY(false);
-
+
region.put(new Integer(0), "create0");
region.put(new Integer(1), "create1");
region.put(new Integer(2), "create2");
region.put(new Integer(3), "create3");
-
-
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- if (cms.isRefreshMetadataTestOnly()) {
- return true;
- }
- return false;
- }
- public String description() {
- return "expected metadataservice to be called atleast once, but it was not called";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> cms.isRefreshMetadataTestOnly() == true);
cms.satisfyRefreshMetadata_TEST_ONLY(false);
region.put(new Integer(0), "create0");
region.put(new Integer(1), "create1");
region.put(new Integer(2), "create2");
region.put(new Integer(3), "create3");
- //pause(5000);
- wc = new WaitCriterion() {
- public boolean done() {
- return !cms.isRefreshMetadataTestOnly();
- }
-
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> cms.isRefreshMetadataTestOnly() == false);
}
public void test_MetadataServiceCallAccuracy_FromDestroyOp() {
@@ -434,26 +414,13 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView());
final ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.satisfyRefreshMetadata_TEST_ONLY(false);
-
+
region.destroy(new Integer(0));
region.destroy(new Integer(1));
region.destroy(new Integer(2));
region.destroy(new Integer(3));
-
-
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- if (cms.isRefreshMetadataTestOnly()) {
- return true;
- }
- return false;
- }
- public String description() {
- return "expected metadataservice to be called atleast once, but it was not called";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> cms.isRefreshMetadataTestOnly() == true);
}
public void test_MetadataServiceCallAccuracy_FromGetOp() {
@@ -470,26 +437,14 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
final ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.satisfyRefreshMetadata_TEST_ONLY(false);
-
+
region.get(new Integer(0));
region.get(new Integer(1));
region.get(new Integer(2));
region.get(new Integer(3));
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- if (cms.isRefreshMetadataTestOnly()) {
- return true;
- }
- return false;
- }
-
- public String description() {
- return "expected metadataservice to be called atleast once, but it was not called";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> cms.isRefreshMetadataTestOnly() == true);
printMetadata();
Wait.pause(5000);
cms.satisfyRefreshMetadata_TEST_ONLY(false);
@@ -521,19 +476,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
region.put(new Integer(i), new Integer(i + 1));
}
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- if (cms.isRefreshMetadataTestOnly()) {
- return true;
- }
- return false;
- }
-
- public String description() {
- return "expected metadataservice to be called atleast once, but it was not called";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> cms.isRefreshMetadataTestOnly() == true);
// kill server
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer());
@@ -580,7 +523,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
}
}
-
+
public void test_NoMetadataServiceCall_ForGetOp() {
Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 0, 4 ));
@@ -623,11 +566,11 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoSinglePR());
ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.satisfyRefreshMetadata_TEST_ONLY(false);
-
+
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView());
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.printView());
-
+
region.put(new Integer(0), "create0");
final boolean metadataRefreshed_get1 = cms
.isRefreshMetadataTestOnly();
@@ -690,20 +633,20 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 ));
Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 ));
createClient(port0, port1, port2, port3);
- putIntoPartitionedRegions();
+ putIntoPartitionedRegions();
getFromPartitionedRegions();
Wait.pause(5000);
ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
- Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
+ Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
assertEquals(4, regionMetaData.size());
assertTrue(regionMetaData.containsKey(region.getFullPath()));
assertTrue(regionMetaData.containsKey(customerRegion.getFullPath()));
assertTrue(regionMetaData.containsKey(orderRegion.getFullPath()));
assertTrue(regionMetaData.containsKey(shipmentRegion.getFullPath()));
-
- ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
+
+ ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
assertEquals(4/*numBuckets*/, prMetaData.getBucketServerLocationsMap_TEST_ONLY().size());
-
+
for (Entry entry : prMetaData.getBucketServerLocationsMap_TEST_ONLY().entrySet()) {
assertEquals(4, ((List)entry.getValue()).size());
}
@@ -714,7 +657,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
verifyDeadServer(regionMetaData, customerRegion, port0, port1);
verifyDeadServer(regionMetaData, region, port0, port1);
}
-
+
public void testMetadataFetchOnlyThroughFunctions() {
//Workaround for 52004
IgnoredException.addIgnoredException("InternalFunctionInvocationTargetException");
@@ -726,23 +669,14 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
executeFunctions();
ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
final Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
-
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- return (regionMetaData.size() == 1);
- }
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
-
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> regionMetaData.size() == 1);
+
assertEquals(1, regionMetaData.size());
assertTrue(regionMetaData.containsKey(region.getFullPath()));
-
- final ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
-
+
+ final ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
+
//Fixes a race condition in GEODE-414 by retrying as
//region.clientMetaDataLock.tryLock() may prevent fetching the
//metadata through functional calls as only limited functions are executed in the test.
@@ -760,17 +694,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
break;
}
} while (System.currentTimeMillis() - start < 60000);
-
- wc = new WaitCriterion() {
- public boolean done() {
- return (prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4);
- }
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4));
// assertIndexDetailsEquals(4/*numBuckets*/, prMetaData.getBucketServerLocationsMap_TEST_ONLY().size());
}
@@ -782,35 +707,18 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
createClient(port0, port1, port2, port3);
putAll();
ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
- final Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- return (regionMetaData.size() == 1);
- }
+ final Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
-
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (regionMetaData.size() == 1));
assertTrue(regionMetaData.containsKey(region.getFullPath()));
-
- final ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
- wc = new WaitCriterion() {
- public boolean done() {
- return (prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4);
- }
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ final ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
+
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4));
}
-
-
-
+
+
+
@Ignore("Bug 47950")
public void DISABLED_testMetadataIsSameOnAllServersAndClients() {
Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 3, 4 ));
@@ -823,15 +731,15 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
-
-
+
+
ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.getClientPRMetadata((LocalRegion)region);
-
- Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
+
+ Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
assertEquals(1, regionMetaData.size());
assertTrue(regionMetaData.containsKey(region.getFullPath()));
-
+
ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
final Map<Integer, List<BucketServerLocation66>> clientMap = prMetaData.getBucketServerLocationsMap_TEST_ONLY();
WaitCriterion wc = new WaitCriterion() {
@@ -843,7 +751,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
return "expected no metadata to be refreshed";
}
};
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Wait.waitForCriterion(wc, 60000, 1000, true);
for (Entry entry : clientMap.entrySet()) {
assertEquals(4, ((List)entry.getValue()).size());
}
@@ -851,10 +759,10 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
-
+
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer());
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer());
-
+
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.startServerOnPort( port0 ));
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.startServerOnPort( port1 ));
put();
@@ -862,15 +770,15 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
-
+
cms = ((GemFireCacheImpl)cache).getClientMetadataService();
-
+
wc = new WaitCriterion() {
public boolean done() {
- ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
- Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
+ ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
+ Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
assertEquals(1, regionMetaData.size());
- assertTrue(regionMetaData.containsKey(region.getFullPath()));
+ assertTrue(regionMetaData.containsKey(region.getFullPath()));
ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
Map<Integer, List<BucketServerLocation66>> clientMap = prMetaData.getBucketServerLocationsMap_TEST_ONLY();
assertEquals(4/*numBuckets*/, clientMap.size());
@@ -892,11 +800,11 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
Wait.waitForCriterion(wc, 60000, 400, true);
cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.getClientPRMetadata((LocalRegion)region);
-
- regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
+
+ regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
assertEquals(1, regionMetaData.size());
assertTrue(regionMetaData.containsKey(region.getFullPath()));
-
+
prMetaData = regionMetaData.get(region.getFullPath());
final Map<Integer, List<BucketServerLocation66>> clientMap2 = prMetaData.getBucketServerLocationsMap_TEST_ONLY();
wc = new WaitCriterion() {
@@ -908,19 +816,19 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
return "expected no metadata to be refreshed";
}
};
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Wait.waitForCriterion(wc, 60000, 1000, true);
for (Entry entry : clientMap.entrySet()) {
assertEquals(4, ((List)entry.getValue()).size());
}
-
+
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
-
+
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect());
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect());
-
+
// member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerOnPort(3,4,port0 ));
// member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServerOnPort(3,4,port1 ));
put();
@@ -932,7 +840,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
.getRegionAdvisor().getAllClientBucketProfilesTest();
}
});
-
+
member3.invoke(new CacheSerializableRunnable("aba") {
@Override
public void run2() throws CacheException {
@@ -941,31 +849,22 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
.getRegionAdvisor().getAllClientBucketProfilesTest();
}
});
-
+
// member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
// member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
-
+
cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.getClientPRMetadata((LocalRegion)region);
-
- regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
+
+ regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
assertEquals(1, regionMetaData.size());
assertTrue(regionMetaData.containsKey(region.getFullPath()));
-
+
prMetaData = regionMetaData.get(region.getFullPath());
final Map<Integer, List<BucketServerLocation66>> clientMap3 = prMetaData.getBucketServerLocationsMap_TEST_ONLY();
- wc = new WaitCriterion() {
- public boolean done() {
- return (clientMap3.size() == 4);
- }
-
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (clientMap3.size() == 4));
for (Entry entry : clientMap.entrySet()) {
assertEquals(2, ((List)entry.getValue()).size());
}
@@ -988,36 +887,28 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
public String description() {
return "verification of metadata on all members";
}
-
+
}, 20000, 2000, true);
+
}
-
+
public void testMetadataIsSameOnAllServersAndClientsHA() {
Integer port0 = (Integer)member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 2, 4 ));
Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createServer( 2, 4 ));
-
+
createClient(port0, port1, port0, port1);
put();
-
+
ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.getClientPRMetadata((LocalRegion)region);
-
- final Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
-
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- return (regionMetaData.size() == 1);
- }
- public String description() {
- return "expected metadata is ready";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
-
+ final Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
+
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (regionMetaData.size() == 1));
+
assertEquals(1, regionMetaData.size());
assertTrue(regionMetaData.containsKey(region.getFullPath()));
-
+
member0.invoke(new CacheSerializableRunnable("aba") {
@Override
public void run2() throws CacheException {
@@ -1026,7 +917,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
.getRegionAdvisor().getAllClientBucketProfilesTest();
}
});
-
+
member1.invoke(new CacheSerializableRunnable("aba") {
@Override
public void run2() throws CacheException {
@@ -1035,73 +926,55 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
.getRegionAdvisor().getAllClientBucketProfilesTest();
}
});
-
+
ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
final Map<Integer, List<BucketServerLocation66>> clientMap = prMetaData.getBucketServerLocationsMap_TEST_ONLY();
- wc = new WaitCriterion() {
- public boolean done() {
- return (clientMap.size() == 4);
- }
-
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (clientMap.size() == 4));
for (Entry entry : clientMap.entrySet()) {
assertEquals(2, ((List)entry.getValue()).size());
}
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
-
+
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.stopServer());
-
+
put();
-
+
cms = ((GemFireCacheImpl)cache).getClientMetadataService();
cms.getClientPRMetadata((LocalRegion)region);
-
+
//member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.verifyMetadata(clientMap));
-
+
assertEquals(4/*numBuckets*/, clientMap.size());
for (Entry entry : clientMap.entrySet()) {
assertEquals(1, ((List)entry.getValue()).size());
}
-
- wc = new WaitCriterion() {
- private int bucketId;
- private int size;
+
+ assertEquals(1, regionMetaData.size());
+ assertTrue(regionMetaData.containsKey(region.getFullPath()));
+ assertEquals(4/*numBuckets*/, clientMap.size());
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> {
+ int bucketId = -1;
+ int size = -1;
List globalList = new ArrayList();
- public boolean done() {
- ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
- Map<String, ClientPartitionAdvisor> regionMetaData = cms.getClientPRMetadata_TEST_ONLY();
- assertEquals(1, regionMetaData.size());
- assertTrue(regionMetaData.containsKey(region.getFullPath()));
- ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
- Map<Integer, List<BucketServerLocation66>> clientMap = prMetaData.getBucketServerLocationsMap_TEST_ONLY();
- assertEquals(4/*numBuckets*/, clientMap.size());
- boolean finished = true;
- for (Entry entry : clientMap.entrySet()) {
- List list = (List)entry.getValue();
- if(list.size() != 1){
- size = list.size();
- globalList = list;
- bucketId = (Integer)entry.getKey();
- finished = false;
- }
+ boolean finished = true;
+ for (Entry entry : clientMap.entrySet()) {
+ List list = (List) entry.getValue();
+ if (list.size() != 1) {
+ size = list.size();
+ globalList = list;
+ bucketId = (Integer) entry.getKey();
+ finished = false;
+ System.out.println("bucket copies are not created, the locations size for bucket id : "
+ + bucketId + " size : " + size + " the list is " + globalList);
}
- return finished;
}
- public String description() {
- return "bucket copies are not created, the locations size for bucket id : "
- + bucketId + " size : " + size + " the list is " + globalList;
- }
- };
- Wait.waitForCriterion(wc, 60000, 400, true);
+ return finished;
+ });
}
//TODO This is failing in WAN_Dev_Dec11 branch after downmerge from trunk revision 34709
-
+
// This test is disabled due to intermittent failures in unit test runs
// Please see ticket #52203
public void disabledtestClientMetadataForPersistentPrs() throws Exception {
@@ -1109,14 +982,14 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
Integer port1 = (Integer)member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 ));
Integer port2 = (Integer)member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 ));
Integer port3 = (Integer)member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.createPersistentPrsAndServer( 3, 4 ));
-
+
member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.putIntoPartitionedRegions());
-
+
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member1.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member2.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
member3.invoke(() -> PartitionedRegionSingleHopDUnitTest.waitForLocalBucketsCreation(4));
-
+
createClient(port0, port1, port2, port3);
fetchAndValidateMetadata();
member0.invoke(() -> PartitionedRegionSingleHopDUnitTest.closeCacheAndDisconnect());
@@ -1134,8 +1007,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
m0.join();
fetchAndValidateMetadata();
}
-
-
+
+
private void fetchAndValidateMetadata() {
ClientMetadataService service = ((GemFireCacheImpl)this.cache)
.getClientMetadataService();
@@ -1156,14 +1029,14 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
if (servers.size() < 4) {
fail("Servers size is " +servers.size() + " less than expected 4.");
}
- }
+ }
}
-
+
public static void verifyMetadata(Map<Integer, List<BucketServerLocation66>> clientMap){
final PartitionedRegion pr = (PartitionedRegion)region;
ConcurrentHashMap<Integer, Set<ServerBucketProfile>> serverMap = pr.getRegionAdvisor().getAllClientBucketProfilesTest();
assertEquals(clientMap.size(), serverMap.size());
- assertTrue(clientMap.keySet().containsAll(serverMap.keySet()));
+ assertTrue(clientMap.keySet().containsAll(serverMap.keySet()));
for(Map.Entry<Integer, List<BucketServerLocation66>> entry : clientMap.entrySet()){
int bucketId = entry.getKey();
List<BucketServerLocation66> list = entry.getValue();
@@ -1191,7 +1064,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
assertTrue(primaryCnt==1);
}
}
-
+
public static void waitForLocalBucketsCreation(final int numBuckets){
final PartitionedRegion pr = (PartitionedRegion)region;
WaitCriterion wc = new WaitCriterion() {
@@ -1211,37 +1084,21 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
};
Wait.waitForCriterion(wc, 60000, 400, true);
}
-
- public static void waitForBucketsCreation(){
- final PartitionedRegion pr = (PartitionedRegion)region;
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- if (pr.getDataStore().getAllLocalBuckets().size() == 2) {
- return true;
- }
- return false;
- }
- public String description() {
- return "bucket copies are not created";
- }
- };
- Wait.waitForCriterion(wc, 60000, 400, true);
- }
-
+
private void verifyDeadServer(Map<String, ClientPartitionAdvisor> regionMetaData, Region region, int port0, int port1) {
-
+
ServerLocation sl0 = new ServerLocation("localhost", port0);
ServerLocation sl1 = new ServerLocation("localhost", port1);
-
- final ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
-
+
+ final ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
+
for (Entry entry : prMetaData.getBucketServerLocationsMap_TEST_ONLY().entrySet()) {
List servers = (List)entry.getValue();
assertFalse( servers.contains(sl0) );
assertFalse( servers.contains(sl1) );
}
}
-
+
public static void createClientWithoutPRSingleHopEnabled(int port0) {
Properties props = new Properties();
props = new Properties();
@@ -1267,7 +1124,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
createRegionsInClientCache(p.getName());
}
-
+
public static int createAccessorServer() {
CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
"PartitionedRegionSingleHopDUnitTest");
@@ -1405,13 +1262,13 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
assertNotNull(shipmentRegion);
LogWriterUtils.getLogWriter().info(
"Partitioned Region SHIPMENT created Successfully :"
- + shipmentRegion.toString());
-
+ + shipmentRegion.toString());
+
replicatedRegion = cache.createRegion("rr", new AttributesFactory().create());
return port;
}
-
+
public static int createPersistentPrsAndServer(int redundantCopies, int totalNoofBuckets) {
CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
"PartitionedRegionSingleHopDUnitTest");
@@ -1481,8 +1338,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
assertNotNull(shipmentRegion);
LogWriterUtils.getLogWriter().info(
"Partitioned Region SHIPMENT created Successfully :"
- + shipmentRegion.toString());
-
+ + shipmentRegion.toString());
+
replicatedRegion = cache.createRegion("rr", new AttributesFactory().create());
CacheServer server = cache.addCacheServer();
int port = AvailablePort.getRandomAvailablePort(AvailablePort.SOCKET);
@@ -1565,8 +1422,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
assertNotNull(shipmentRegion);
LogWriterUtils.getLogWriter().info(
"Partitioned Region SHIPMENT created Successfully :"
- + shipmentRegion.toString());
-
+ + shipmentRegion.toString());
+
replicatedRegion = cache.createRegion("rr", new AttributesFactory().create());
CacheServer server = cache.addCacheServer();
server.setPort(port);
@@ -1645,12 +1502,12 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
assertNotNull(shipmentRegion);
LogWriterUtils.getLogWriter().info(
"Partitioned Region SHIPMENT created Successfully :"
- + shipmentRegion.toString());
-
+ + shipmentRegion.toString());
+
replicatedRegion = cache.createRegion("rr", new AttributesFactory().create());
}
-
+
public static void startServerOnPort(int port) {
CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
"PartitionedRegionSingleHopDUnitTest");
@@ -1665,7 +1522,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
Assert.fail("Failed to start server ", e);
}
}
-
+
public static void createPeer() {
CacheTestCase test = new PartitionedRegionSingleHopDUnitTest(
@@ -1826,7 +1683,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
createRegionsInClientCache(p.getName());
}
-
+
private static void createRegionsInClientCache(String poolName) {
AttributesFactory factory = new AttributesFactory();
factory.setPoolName(poolName);
@@ -1876,7 +1733,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
factory.setPoolName(poolName);
replicatedRegion = cache.createRegion("rr", factory.create());
}
-
+
public static void putIntoPartitionedRegions() {
for (int i = 0; i <= 3; i++) {
CustId custid = new CustId(i);
@@ -1948,7 +1805,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
return true;
}
}
-
+
public static void executeFunctions() {
Set filter = new HashSet();
filter.add(0);
@@ -1960,7 +1817,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
FunctionService.onRegion(region).withFilter(filter).execute(new MyFunctionAdapter()).getResult();
FunctionService.onRegion(region).execute(new MyFunctionAdapter()).getResult();
}
-
+
public static void putAll() {
Map map = new HashMap();
map.put(0, 0);
@@ -1971,8 +1828,8 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
region.putAll(map);
region.putAll(map);
region.putAll(map);
- }
-
+ }
+
public static void put() {
region.put(new Integer(0), "create0");
@@ -1992,7 +1849,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
region.put(new Integer(1), "update11");
region.put(new Integer(2), "update22");
region.put(new Integer(3), "update33");
-*/ }
+*/ }
public static void getFromPartitionedRegions() {
for (int i = 0; i <= 3; i++) {
@@ -2052,7 +1909,7 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
cms.satisfyRefreshMetadata_TEST_ONLY(false);
region.put(new Integer(0), "update0");
assertEquals(false, cms.isRefreshMetadataTestOnly());
-
+
region.put(new Integer(1), "update1");
assertEquals(false, cms.isRefreshMetadataTestOnly());
@@ -2118,31 +1975,11 @@ public class PartitionedRegionSingleHopDUnitTest extends CacheTestCase {
ClientMetadataService cms = ((GemFireCacheImpl)cache).getClientMetadataService();
final Map<String, ClientPartitionAdvisor> regionMetaData = cms
.getClientPRMetadata_TEST_ONLY();
-
- WaitCriterion wc = new WaitCriterion() {
- public boolean done() {
- return (regionMetaData.size() == 4);
- }
-
- public String description() {
- return "expected PRAdvisor to be ready";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
-
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (regionMetaData.size() == 4));
assertEquals(4, regionMetaData.size());
assertTrue(regionMetaData.containsKey(region.getFullPath()));
final ClientPartitionAdvisor prMetaData = regionMetaData.get(region.getFullPath());
- wc = new WaitCriterion() {
- public boolean done() {
- return (prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4);
- }
-
- public String description() {
- return "expected no metadata to be refreshed";
- }
- };
- Wait.waitForCriterion(wc, 60000, 1000, true);
+ Awaitility.waitAtMost(60, TimeUnit.SECONDS).until(() -> (prMetaData.getBucketServerLocationsMap_TEST_ONLY().size() == 4));
}
}
[5/6] incubator-geode git commit: GEODE-248: remove unused
BoundedLinkedHashMap
Posted by kl...@apache.org.
GEODE-248: remove unused BoundedLinkedHashMap
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/fc943cb8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/fc943cb8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/fc943cb8
Branch: refs/heads/feature/GEODE-1376
Commit: fc943cb81e10f4121ce9a1e6ca6e8e0d3fbc10f9
Parents: 463ae16
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Tue May 10 14:15:09 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed May 11 10:13:12 2016 -0700
----------------------------------------------------------------------
.../cache/util/BoundedLinkedHashMap.java | 88 --------------------
.../codeAnalysis/sanctionedSerializables.txt | 1 -
2 files changed, 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fc943cb8/geode-core/src/main/java/com/gemstone/gemfire/cache/util/BoundedLinkedHashMap.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/BoundedLinkedHashMap.java b/geode-core/src/main/java/com/gemstone/gemfire/cache/util/BoundedLinkedHashMap.java
deleted file mode 100755
index fbb024a..0000000
--- a/geode-core/src/main/java/com/gemstone/gemfire/cache/util/BoundedLinkedHashMap.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.gemstone.gemfire.cache.util;
-
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-/**
- * Class <code>BoundedLinkedHashMap</code> is a bounded
- * <code>LinkedHashMap</code>. The bound is the maximum
- * number of entries the <code>BoundedLinkedHashMap</code>
- * can contain.
- *
- * @since 4.2
- * @deprecated as of 5.7 create your own class that extends {@link LinkedHashMap}
- * and implement {@link LinkedHashMap#removeEldestEntry}
- * to enforce a maximum number of entries.
- */
-public class BoundedLinkedHashMap extends LinkedHashMap
-{
- private static final long serialVersionUID = -3419897166186852692L;
-
- /**
- * The maximum number of entries allowed in this
- * <code>BoundedLinkedHashMap</code>
- */
- protected int _maximumNumberOfEntries;
-
- /**
- * Constructor.
- *
- * @param initialCapacity The initial capacity.
- * @param loadFactor The load factor
- * @param maximumNumberOfEntries The maximum number of allowed entries
- */
- public BoundedLinkedHashMap(int initialCapacity, float loadFactor, int maximumNumberOfEntries) {
- super(initialCapacity, loadFactor);
- this._maximumNumberOfEntries = maximumNumberOfEntries;
- }
-
- /**
- * Constructor.
- *
- * @param initialCapacity The initial capacity.
- * @param maximumNumberOfEntries The maximum number of allowed entries
- */
- public BoundedLinkedHashMap(int initialCapacity, int maximumNumberOfEntries) {
- super(initialCapacity);
- this._maximumNumberOfEntries = maximumNumberOfEntries;
- }
-
- /**
- * Constructor.
- *
- * @param maximumNumberOfEntries The maximum number of allowed entries
- */
- public BoundedLinkedHashMap(int maximumNumberOfEntries) {
- super();
- this._maximumNumberOfEntries = maximumNumberOfEntries;
- }
-
- /**
- * Returns the maximum number of entries.
- * @return the maximum number of entries
- */
- public int getMaximumNumberOfEntries(){
- return this._maximumNumberOfEntries;
- }
-
- @Override
- protected boolean removeEldestEntry(Map.Entry entry) {
- return size() > this._maximumNumberOfEntries;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/fc943cb8/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
----------------------------------------------------------------------
diff --git a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
index f356bda..ed0f9fc 100755
--- a/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
+++ b/geode-core/src/test/resources/com/gemstone/gemfire/codeAnalysis/sanctionedSerializables.txt
@@ -202,7 +202,6 @@ com/gemstone/gemfire/cache/query/internal/parse/GemFireAST,true,7799648022743052
com/gemstone/gemfire/cache/query/internal/utils/PDXUtils$1,false
com/gemstone/gemfire/cache/query/internal/utils/PDXUtils$2,false
com/gemstone/gemfire/cache/snapshot/SnapshotOptions$SnapshotFormat,false
-com/gemstone/gemfire/cache/util/BoundedLinkedHashMap,true,-3419897166186852692,_maximumNumberOfEntries:int
com/gemstone/gemfire/cache/util/Gateway$OrderPolicy,false
com/gemstone/gemfire/cache/wan/GatewaySender$OrderPolicy,false
com/gemstone/gemfire/compression/CompressionException,true,4118639654597191235
[6/6] incubator-geode git commit: Merge remote-tracking branch
'origin/develop' into feature/GEODE-1376
Posted by kl...@apache.org.
Merge remote-tracking branch 'origin/develop' into feature/GEODE-1376
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/c3906859
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/c3906859
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/c3906859
Branch: refs/heads/feature/GEODE-1376
Commit: c3906859a7db4790768d68c03ce9e751f2b3946f
Parents: b9b0757 fc943cb
Author: Kirk Lund <kl...@apache.org>
Authored: Wed May 11 10:19:48 2016 -0700
Committer: Kirk Lund <kl...@apache.org>
Committed: Wed May 11 10:19:48 2016 -0700
----------------------------------------------------------------------
.../cache/util/BoundedLinkedHashMap.java | 88 ----
.../internal/SharedConfiguration.java | 2 +-
.../parallel/ParallelQueueRemovalMessage.java | 1 +
.../PartitionedRegionSingleHopDUnitTest.java | 441 ++++++-------------
.../SharedConfigurationDUnitTest.java | 2 +-
.../SharedConfigurationTestUtils.java | 2 +-
.../SharedConfigurationUsingDirDUnitTest.java | 3 +-
.../test/dunit/standalone/DUnitLauncher.java | 2 +
.../test/dunit/standalone/ProcessManager.java | 45 +-
.../codeAnalysis/sanctionedSerializables.txt | 1 -
gradle/test.gradle | 4 +
11 files changed, 178 insertions(+), 413 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/c3906859/geode-core/src/test/java/com/gemstone/gemfire/test/dunit/standalone/DUnitLauncher.java
----------------------------------------------------------------------
[4/6] incubator-geode git commit: GEODE-1282: fix wan off-heap leak
Posted by kl...@apache.org.
GEODE-1282: fix wan off-heap leak
destroyFromTempQueue now releases GatewaySenderEventImpl when it is removed from the tempQueue
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/463ae16a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/463ae16a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/463ae16a
Branch: refs/heads/feature/GEODE-1376
Commit: 463ae16a7c0b762abdf33d2aad1002721cccb53a
Parents: 9d28009
Author: Darrel Schneider <ds...@pivotal.io>
Authored: Mon May 9 10:23:25 2016 -0700
Committer: Darrel Schneider <ds...@pivotal.io>
Committed: Wed May 11 10:11:16 2016 -0700
----------------------------------------------------------------------
.../internal/cache/wan/parallel/ParallelQueueRemovalMessage.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/463ae16a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
----------------------------------------------------------------------
diff --git a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
index 09f70a6..14d2f20 100644
--- a/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
+++ b/geode-core/src/main/java/com/gemstone/gemfire/internal/cache/wan/parallel/ParallelQueueRemovalMessage.java
@@ -237,6 +237,7 @@ public class ParallelQueueRemovalMessage extends PooledDistributionMessage {
afterAckForSecondary_EventInTempQueue(qPR.getParallelGatewaySender(), eventForFilter);
if (eventForFilter.getShadowKey().equals(key)) {
itr.remove();
+ eventForFilter.release(); // GEODE-1282
isDestroyed = true;
}
}