Unverified Commit dce7441b authored by Tboy's avatar Tboy Committed by GitHub
Browse files

Merge pull request #1611 from wenhemin/fixbug-20191227 

fix：In a cluster environment, verify that nodes have matching bug. #{1613}
parents f42dc826 3c6780c3

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/zk/AbstractZKClient.java

+2 −2
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ public abstract class AbstractZKClient extends ZookeeperCachedOperator{ 
		String parentPath = getZNodeParentPath(zkNodeType);

		String serverPathPrefix = parentPath + "/" + OSUtils.getHost();

		String registerPath = zkClient.create().withMode(CreateMode.EPHEMERAL_SEQUENTIAL).forPath(

				serverPathPrefix + "_", heartbeatZKInfo.getBytes());

				serverPathPrefix + UNDERLINE, heartbeatZKInfo.getBytes());

		logger.info("register {} node {} success" , zkNodeType.toString(), registerPath);

		return registerPath;

	}
@@ -307,7 +307,7 @@ public abstract class AbstractZKClient extends ZookeeperCachedOperator{ 
		}

		Map<String, String> serverMaps = getServerMaps(zkNodeType);

		for(String hostKey : serverMaps.keySet()){

			if(hostKey.startsWith(host)){

			if(hostKey.startsWith(host + UNDERLINE)){

				return true;

			}

		}