You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by hu...@apache.org on 2020/04/01 22:46:59 UTC
[helix] 04/49: Upgrade ZkTestBase with multi-ZK support in
helix-core (#712)
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch zooscalability
in repository https://gitbox.apache.org/repos/asf/helix.git
commit eda7677a3d608e5b9a2c0d89bb1454e3341ee53d
Author: Hunter Lee <hu...@linkedin.com>
AuthorDate: Tue Feb 4 12:10:51 2020 -0800
Upgrade ZkTestBase with multi-ZK support in helix-core (#712)
Prior to instrumenting Helix APIs and components so that they would be aware of multiple ZKs for horizontal scalability, we need to have a way to run all integration tests involving ZooKeeper in different environments: one with a single ZK and another with multiple ZKs.
Changelist:
1. Implement the logic in ZkTestBase so that in conjunction with maven-surefire-plugin configs, there will be two executions of the test suite
2. Remove system property variable from default-test since it's unnecessary
---
.../java/org/apache/helix/common/ZkTestBase.java | 74 +++++++++++++++++++---
pom.xml | 6 +-
2 files changed, 66 insertions(+), 14 deletions(-)
diff --git a/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java b/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
index b9c08a9..f1fdf53 100644
--- a/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/common/ZkTestBase.java
@@ -98,6 +98,8 @@ import org.testng.annotations.BeforeSuite;
public class ZkTestBase {
private static Logger LOG = LoggerFactory.getLogger(ZkTestBase.class);
+ private static final String MULTI_ZK_PROPERTY_KEY = "multiZk";
+ private static final String NUM_ZK_PROPERTY_KEY = "numZk";
protected static ZkServer _zkServer;
protected static HelixZkClient _gZkClient;
@@ -107,13 +109,24 @@ public class ZkTestBase {
private Map<String, Map<String, HelixZkClient>> _liveInstanceOwners = new HashMap<>();
- public static final String ZK_ADDR = "localhost:2183";
+ private static final String ZK_PREFIX = "localhost:";
+ private static final int ZK_START_PORT = 2183;
+ public static final String ZK_ADDR = ZK_PREFIX + ZK_START_PORT;
protected static final String CLUSTER_PREFIX = "CLUSTER";
protected static final String CONTROLLER_CLUSTER_PREFIX = "CONTROLLER_CLUSTER";
protected final String CONTROLLER_PREFIX = "controller";
protected final String PARTICIPANT_PREFIX = "localhost";
private static final long MANUAL_GC_PAUSE = 4000L;
+ /*
+ * Multiple ZK references
+ */
+ // The following maps hold ZK connect string as keys
+ protected Map<String, ZkServer> _zkServerMap = new HashMap<>();
+ protected Map<String, HelixZkClient> _helixZkClientMap = new HashMap<>();
+ protected Map<String, ClusterSetup> _clusterSetupMap = new HashMap<>();
+ protected Map<String, BaseDataAccessor> _baseDataAccessorMap = new HashMap<>();
+
@BeforeSuite
public void beforeSuite() throws Exception {
// TODO: use logging.properties file to config java.util.logging.Logger levels
@@ -124,8 +137,32 @@ public class ZkTestBase {
System.setProperty("zookeeper.4lw.commands.whitelist", "*");
System.setProperty(SystemPropertyKeys.CONTROLLER_MESSAGE_PURGE_DELAY, "3000");
- _zkServer = TestHelper.startZkServer(ZK_ADDR);
- AssertJUnit.assertNotNull(_zkServer);
+ // Start in-memory ZooKeepers
+ // If multi-ZooKeeper is enabled, start more ZKs. Otherwise, just set up one ZK
+ int numZkToStart = 1;
+ String multiZkConfig = System.getProperty(MULTI_ZK_PROPERTY_KEY);
+ if (multiZkConfig != null && multiZkConfig.equalsIgnoreCase(Boolean.TRUE.toString())) {
+ String numZkFromConfig = System.getProperty(NUM_ZK_PROPERTY_KEY);
+ if (numZkFromConfig != null) {
+ try {
+ numZkToStart = Math.max(Integer.parseInt(numZkFromConfig), numZkToStart);
+ } catch (Exception e) {
+ Assert.fail("Failed to parse the number of ZKs from config!");
+ }
+ }
+ Assert.fail("multiZk config is set but numZk config is missing!");
+ }
+
+ // Start "numZkFromConfigInt" ZooKeepers
+ for (int i = 0; i < numZkToStart; i++) {
+ startZooKeeper(i);
+ }
+
+ // Set the references for backward-compatibility with a single ZK environment
+ _zkServer = _zkServerMap.get(ZK_ADDR);
+ _gZkClient = _helixZkClientMap.get(ZK_ADDR);
+ _gSetupTool = _clusterSetupMap.get(ZK_ADDR);
+ _baseAccessor = _baseDataAccessorMap.get(ZK_ADDR);
// Clean up all JMX objects
for (ObjectName mbean : _server.queryNames(null, null)) {
@@ -135,13 +172,29 @@ public class ZkTestBase {
// OK
}
}
+ }
+ /**
+ * Starts an additional in-memory ZooKeeper for testing.
+ * @param i index to be added to the ZK port to avoid conflicts
+ * @throws Exception
+ */
+ private void startZooKeeper(int i)
+ throws Exception {
+ String zkAddress = ZK_PREFIX + (ZK_START_PORT + i);
+ ZkServer zkServer = TestHelper.startZkServer(zkAddress);
+ AssertJUnit.assertNotNull(zkServer);
HelixZkClient.ZkClientConfig clientConfig = new HelixZkClient.ZkClientConfig();
clientConfig.setZkSerializer(new ZNRecordSerializer());
- _gZkClient = DedicatedZkClientFactory.getInstance()
- .buildZkClient(new HelixZkClient.ZkConnectionConfig(ZK_ADDR), clientConfig);
- _gSetupTool = new ClusterSetup(_gZkClient);
- _baseAccessor = new ZkBaseDataAccessor<>(_gZkClient);
+ HelixZkClient zkClient = DedicatedZkClientFactory.getInstance()
+ .buildZkClient(new HelixZkClient.ZkConnectionConfig(zkAddress), clientConfig);
+ ClusterSetup gSetupTool = new ClusterSetup(zkClient);
+ BaseDataAccessor baseDataAccessor = new ZkBaseDataAccessor<>(zkClient);
+
+ _zkServerMap.put(zkAddress, zkServer);
+ _helixZkClientMap.put(zkAddress, zkClient);
+ _clusterSetupMap.put(zkAddress, gSetupTool);
+ _baseDataAccessorMap.put(zkAddress, baseDataAccessor);
}
@AfterSuite
@@ -155,8 +208,11 @@ public class ZkTestBase {
}
}
- _gZkClient.close();
- TestHelper.stopZkServer(_zkServer);
+ // Close all ZK resources
+ _baseDataAccessorMap.values().forEach(BaseDataAccessor::close);
+ _clusterSetupMap.values().forEach(ClusterSetup::close);
+ _helixZkClientMap.values().forEach(HelixZkClient::close);
+ _zkServerMap.values().forEach(TestHelper::stopZkServer);
}
@BeforeClass
diff --git a/pom.xml b/pom.xml
index e773d07..6a51c9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -642,11 +642,6 @@ under the License.
</goals>
<id>default-test</id>
<phase>test</phase>
- <configuration>
- <systemPropertyVariables>
- <multiZk>false</multiZk>
- </systemPropertyVariables>
- </configuration>
</execution>
<execution>
<goals>
@@ -657,6 +652,7 @@ under the License.
<configuration>
<systemPropertyVariables>
<multiZk>true</multiZk>
+ <numZk>3</numZk>
</systemPropertyVariables>
</configuration>
</execution>