[helix] branch master updated: Remove commented out code in participant manager (#1029)

[hulee]

This is an automated email from the ASF dual-hosted git repository.

hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git


The following commit(s) were added to refs/heads/master by this push:
     new f3b6c08  Remove commented out code in participant manager (#1029)
f3b6c08 is described below

commit f3b6c0809793452b97b0e403f7a2df08acb7de36
Author: Meng Zhang <mnzh...@linkedin.com>
AuthorDate: Tue May 26 14:50:02 2020 -0700

    Remove commented out code in participant manager (#1029)
---
 .../java/org/apache/helix/manager/zk/ParticipantManager.java | 12 ------------
 1 file changed, 12 deletions(-)

diff --git 
a/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java 
b/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
index 6e9d579..704f247 100644
--- 
a/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
+++ 
b/helix-core/src/main/java/org/apache/helix/manager/zk/ParticipantManager.java
@@ -201,18 +201,6 @@ public class ParticipantManager {
           String domain = cloudInstanceInformation
               
.get(CloudInstanceInformation.CloudInstanceField.FAULT_DOMAIN.name()) + 
_instanceName;
 
-          // Disable the verification for now
-          /*String cloudIdInRemote = cloudInstanceInformation
-              
.get(CloudInstanceInformation.CloudInstanceField.INSTANCE_SET_NAME.name());
-          String cloudIdInConfig = 
_configAccessor.getCloudConfig(_clusterName).getCloudID();
-
-          // validate that the instance is auto registering to the correct 
cluster
-          if (!cloudIdInRemote.equals(cloudIdInConfig)) {
-            throw new IllegalArgumentException(String.format(
-                "cloudId in config: %s is not consistent with cloudId from 
remote: %s. The instance is auto registering to a wrong cluster.",
-                cloudIdInConfig, cloudIdInRemote));
-          }*/
-
           InstanceConfig instanceConfig = 
HelixUtil.composeInstanceConfig(_instanceName);
           instanceConfig.setDomain(domain);
           _helixAdmin.addInstance(_clusterName, instanceConfig);