From afcd3314d13ca3c0ddaa70e81b8cdeda0e870536 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E6=99=9F=20Wu=20Sheng?= Date: Mon, 19 Mar 2018 18:03:17 +0800 Subject: [PATCH] Fix zk path error. (#963) --- .../collector/cluster/zookeeper/ClusterZKDataMonitor.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java index eb51be648..4def6a81b 100644 --- a/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java +++ b/apm-collector/apm-collector-cluster/collector-cluster-zookeeper-provider/src/main/java/org/apache/skywalking/apm/collector/cluster/zookeeper/ClusterZKDataMonitor.java @@ -34,6 +34,7 @@ import org.apache.skywalking.apm.collector.cluster.DataMonitor; import org.apache.skywalking.apm.collector.cluster.ModuleRegistration; import org.apache.skywalking.apm.collector.core.CollectorException; import org.apache.skywalking.apm.collector.core.util.CollectionUtils; +import org.apache.skywalking.apm.util.StringUtil; import org.apache.zookeeper.CreateMode; import org.apache.zookeeper.WatchedEvent; import org.apache.zookeeper.Watcher; @@ -165,7 +166,11 @@ public class ClusterZKDataMonitor implements DataMonitor, Watcher { } @Override public String getBaseCatalog() { - return "/" + namespace + "/skywalking"; + if (StringUtil.isEmpty(namespace)) { + return "/skywalking"; + } else { + return "/" + namespace + "/skywalking"; + } } void setNamespace(String namespace) {