pkuwm commented on a change in pull request #863: Make ZkCacheBaseDataAccessor
and ZkHelixPropertyStore realm-aware
URL: https://github.com/apache/helix/pull/863#discussion_r390727534
##########
File path:
helix-core/src/main/java/org/apache/helix/manager/zk/ZkCacheBaseDataAccessor.java
##########
@@ -90,50 +104,62 @@ public ZkCacheBaseDataAccessor(ZkBaseDataAccessor<T>
baseAccessor, String chroot
_wtCachePaths = wtCachePaths;
_zkCachePaths = zkCachePaths;
- // TODO: need to make sure no overlap between wtCachePaths and zkCachePaths
- // TreeMap key is ordered by key string length, so more general (i.e.
short) prefix
- // comes first
- _cacheMap = new TreeMap<>(new Comparator<String>() {
- @Override
- public int compare(String o1, String o2) {
- int len1 = o1.split("/").length;
- int len2 = o2.split("/").length;
- return len1 - len2;
- }
- });
-
start();
}
+ @Deprecated
public ZkCacheBaseDataAccessor(String zkAddress, ZkSerializer serializer,
String chrootPath,
List<String> wtCachePaths, List<String> zkCachePaths) {
this(zkAddress, serializer, chrootPath, wtCachePaths, zkCachePaths, null,
null,
ZkBaseDataAccessor.ZkClientType.SHARED);
}
+ @Deprecated
public ZkCacheBaseDataAccessor(String zkAddress, ZkSerializer serializer,
String chrootPath,
List<String> wtCachePaths, List<String> zkCachePaths, String
monitorType, String monitorkey) {
this(zkAddress, serializer, chrootPath, wtCachePaths, zkCachePaths,
monitorType, monitorkey,
ZkBaseDataAccessor.ZkClientType.SHARED);
}
+ @Deprecated
public ZkCacheBaseDataAccessor(String zkAddress, ZkSerializer serializer,
String chrootPath,
List<String> wtCachePaths, List<String> zkCachePaths, String
monitorType, String monitorkey,
ZkBaseDataAccessor.ZkClientType zkClientType) {
- HelixZkClient.ZkClientConfig clientConfig = new
HelixZkClient.ZkClientConfig();
-
clientConfig.setZkSerializer(serializer).setMonitorType(monitorType).setMonitorKey(monitorkey);
- switch (zkClientType) {
- case DEDICATED:
- _zkClient = DedicatedZkClientFactory.getInstance().buildZkClient(
- new HelixZkClient.ZkConnectionConfig(zkAddress),
- new HelixZkClient.ZkClientConfig().setZkSerializer(serializer));
- break;
- case SHARED:
- default:
- _zkClient = SharedZkClientFactory.getInstance()
- .buildZkClient(new HelixZkClient.ZkConnectionConfig(zkAddress),
clientConfig);
- }
- _zkClient.waitUntilConnected(HelixZkClient.DEFAULT_CONNECTION_TIMEOUT,
TimeUnit.MILLISECONDS);
+
+ // If the multi ZK config is enabled, use multi-realm mode with
FederatedZkClient
+ if
(Boolean.parseBoolean(System.getProperty(SystemPropertyKeys.MULTI_ZK_ENABLED)))
{
+ try {
+ RealmAwareZkClient.RealmAwareZkConnectionConfig.Builder
connectionConfigBuilder =
+ new RealmAwareZkClient.RealmAwareZkConnectionConfig.Builder();
+ RealmAwareZkClient.RealmAwareZkClientConfig clientConfig =
+ new RealmAwareZkClient.RealmAwareZkClientConfig();
+ clientConfig.setZkSerializer(serializer).setMonitorType(monitorType)
+ .setMonitorKey(monitorkey);
+ // Use a federated zk client
+ _zkClient = new FederatedZkClient(connectionConfigBuilder.build(),
clientConfig);
+ } catch (IOException | InvalidRoutingDataException |
IllegalStateException e) {
+ // Note: IllegalStateException is for HttpRoutingDataReader if MSDS
endpoint cannot be
+ // found
+ throw new HelixException("Failed to create ZkCacheBaseDataAccessor!",
e);
+ }
+ } else {
+ HelixZkClient.ZkClientConfig clientConfig = new
HelixZkClient.ZkClientConfig();
+ clientConfig.setZkSerializer(serializer).setMonitorType(monitorType)
+ .setMonitorKey(monitorkey);
+ switch (zkClientType) {
+ case DEDICATED:
+ _zkClient = DedicatedZkClientFactory.getInstance()
+ .buildZkClient(new HelixZkClient.ZkConnectionConfig(zkAddress),
+ new
HelixZkClient.ZkClientConfig().setZkSerializer(serializer));
+ break;
+ case SHARED:
+ default:
+ _zkClient = SharedZkClientFactory.getInstance()
+ .buildZkClient(new HelixZkClient.ZkConnectionConfig(zkAddress),
clientConfig);
+ }
+ _zkClient.waitUntilConnected(HelixZkClient.DEFAULT_CONNECTION_TIMEOUT,
TimeUnit.MILLISECONDS);
Review comment:
Note: current FederatedZkClient doesn't support `waitUntilConnected()`
because of multiple raw zkClients. We shall move `waitUntilConnected` to only
single-realm mode.
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
