Merge conflicts :()

linkedin · Aug 13, 2024 · cb62f8f · cb62f8f
1 parent 98ca7f2
commit cb62f8f
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/...c/integrationTest/java/com/linkedin/venice/integration/utils/VeniceControllerWrapper.java b/...c/integrationTest/java/com/linkedin/venice/integration/utils/VeniceControllerWrapper.java
@@ -165,8 +165,12 @@ static StatefulServiceProvider<VeniceControllerWrapper> generateService(VeniceCo
 
       PubSubClientsFactory pubSubClientsFactory = options.getKafkaBroker().getPubSubClientsFactory();
       for (String clusterName: options.getClusterNames()) {
-        VeniceProperties clusterProps = IntegrationTestUtils
-            .getClusterProps(clusterName, options.getZkAddress(), options.getKafkaBroker(), options.isSslToKafka());
+        VeniceProperties clusterProps = IntegrationTestUtils.getClusterProps(
+            clusterName,
+            options.getZkAddress(),
+            options.getVeniceZkBasePath(),
+            options.getKafkaBroker(),
+            options.isSslToKafka());
 
         // TODO: Validate that these configs are all still used.
         // TODO: Centralize default config values in a single place
@@ -365,12 +369,6 @@ static StatefulServiceProvider<VeniceControllerWrapper> generateService(VeniceCo
           .build();
       VeniceController veniceController = new VeniceController(ctx);
 
-      // String zkBasePath;
-      // if (options.isParent()) {
-      // zkBasePath = "/test-venice-parent";
-      // } else {
-      // zkBasePath = "/test-venice";
-      // }
       return new VeniceControllerWrapper(
           options.getRegionName(),
           serviceName,

diff --git a/...a/com/linkedin/venice/integration/utils/VeniceTwoLayerMultiRegionMultiClusterWrapper.java b/...a/com/linkedin/venice/integration/utils/VeniceTwoLayerMultiRegionMultiClusterWrapper.java
@@ -95,6 +95,7 @@ static ServiceProvider<VeniceTwoLayerMultiRegionMultiClusterWrapper> generateSer
 
     try {
       zkServer = ServiceFactory.getZkServer();
+      IntegrationTestUtils.ensureZkPathExists(zkServer.getAddress(), options.getParentVeniceZkBasePath());
       parentPubSubBrokerWrapper = ServiceFactory.getPubSubBroker(
           new PubSubBrokerConfigs.Builder().setZkWrapper(zkServer)
               .setRegionName(DEFAULT_PARENT_DATA_CENTER_REGION_NAME)
@@ -149,11 +150,16 @@ static ServiceProvider<VeniceTwoLayerMultiRegionMultiClusterWrapper> generateSer
           .put(CHILD_DATA_CENTER_KAFKA_URL_PREFIX + "." + parentRegionName, parentPubSubBrokerWrapper.getAddress());
       for (String regionName: childRegionName) {
         ZkServerWrapper zkServerWrapper = ServiceFactory.getZkServer();
-        ZkServerWrapper parentZkServerWrapper = ServiceFactory.getZkServer();
+        IntegrationTestUtils.ensureZkPathExists(zkServerWrapper.getAddress(), options.getChildVeniceZkBasePath());
+        if (options.isParentControllerInChildRegion()) {
+          ZkServerWrapper parentZkServerWrapper = ServiceFactory.getZkServer();
+          IntegrationTestUtils
+              .ensureZkPathExists(parentZkServerWrapper.getAddress(), options.getParentVeniceZkBasePath());
+          zkServerByRegionName.put(parentRegionName + regionName, parentZkServerWrapper);
+        }
         PubSubBrokerWrapper regionalPubSubBrokerWrapper = ServiceFactory.getPubSubBroker(
             new PubSubBrokerConfigs.Builder().setZkWrapper(zkServerWrapper).setRegionName(regionName).build());
         allPubSubBrokerWrappers.add(regionalPubSubBrokerWrapper);
-        zkServerByRegionName.put(parentRegionName + regionName, parentZkServerWrapper);
         zkServerByRegionName.put(regionName, zkServerWrapper);
         pubSubBrokerByRegionName.put(regionName, regionalPubSubBrokerWrapper);
         nativeReplicationRequiredChildControllerProps
@@ -192,6 +198,7 @@ static ServiceProvider<VeniceTwoLayerMultiRegionMultiClusterWrapper> generateSer
       additionalServerProps.putAll(pubSubBrokerProps);
 
       VeniceMultiClusterCreateOptions.Builder builder = new VeniceMultiClusterCreateOptions.Builder().multiRegion(true)
+          .veniceZkBasePath(options.getChildVeniceZkBasePath())
           .numberOfClusters(options.getNumberOfClusters())
           .numberOfControllers(options.getNumberOfChildControllers())
           .numberOfServers(options.getNumberOfServers())
@@ -242,6 +249,7 @@ static ServiceProvider<VeniceTwoLayerMultiRegionMultiClusterWrapper> generateSer
                   clusterNames,
                   zkServerByRegionName.get(parentRegionName + regionName),
                   parentPubSubBrokerWrapper).multiRegion(true)
+                      .veniceZkBasePath(options.getParentVeniceZkBasePath())
                       .replicationFactor(options.getReplicationFactor())
                       .childControllers(childControllers)
                       .extraProperties(i == 0 ? activeParentControllerProperties : passiveParentControllerProperties)
@@ -256,6 +264,7 @@ static ServiceProvider<VeniceTwoLayerMultiRegionMultiClusterWrapper> generateSer
         VeniceControllerCreateOptions parentControllerCreateOptions =
             new VeniceControllerCreateOptions.Builder(clusterNames, zkServer, parentPubSubBrokerWrapper)
                 .multiRegion(true)
+                .veniceZkBasePath(options.getParentVeniceZkBasePath())
                 .replicationFactor(options.getReplicationFactor())
                 .childControllers(childControllers)
                 .extraProperties(finalParentControllerProperties)