kazusa
/
skywalking-java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed #327. 

When collector server restart at short intervals that zookeeper will not find remove this server path.
But in another situation, there was a same address server has been running, the restart server could not remove this path and recreate it.
So when this situation happened, throw exception to stop this restart server.
This commit is contained in:
pengys5 2017-08-01 20:14:47 +08:00
parent 3de64ff0f8
commit f2a98193d4
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/ClusterNodeExistException.java Normal file
View File

@ -0,0 +1,17 @@
package org.skywalking.apm.collector.cluster;
import org.skywalking.apm.collector.core.client.ClientException;
/**
* @author pengys5
*/
public class ClusterNodeExistException extends ClientException {
public ClusterNodeExistException(String message) {
super(message);
}
public ClusterNodeExistException(String message, Throwable cause) {
super(message, cause);
}
}

7
apm-collector/apm-collector-cluster/src/main/java/org/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java
View File

@ -10,6 +10,7 @@ import org.apache.zookeeper.ZooDefs;
import org.skywalking.apm.collector.client.zookeeper.ZookeeperClient;
import org.skywalking.apm.collector.client.zookeeper.ZookeeperClientException;
import org.skywalking.apm.collector.client.zookeeper.util.PathUtils;
import org.skywalking.apm.collector.cluster.ClusterNodeExistException;
import org.skywalking.apm.collector.core.client.Client;
import org.skywalking.apm.collector.core.client.ClientException;
import org.skywalking.apm.collector.core.client.DataMonitor;
@ -74,7 +75,11 @@ public class ClusterZKDataMonitor implements DataMonitor, Watcher {
String serverPath = path + "/" + value.getHostPort();
listener.addAddress(value.getHostPort() + contextPath);
setData(serverPath, contextPath);
if (client.exists(serverPath, false) == null) {
setData(serverPath, contextPath);
} else {
throw new ClusterNodeExistException("current address: " + value.getHostPort() + " has been registered, check the host and port configuration or wait a moment.");
}
}
@Override public ClusterDataListener getListener(String path) {