#190 fix namespaceIsCorrect, check exists for $SaturnExecutors, $Jobs

vipshop · Aug 16, 2017 · 5ce9fe0 · 5ce9fe0
1 parent 48d1bc5
commit 5ce9fe0
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/...sole/src/main/java/com/vip/saturn/job/console/service/impl/RegistryCenterServiceImpl.java b/...sole/src/main/java/com/vip/saturn/job/console/service/impl/RegistryCenterServiceImpl.java
@@ -804,7 +804,20 @@ public boolean namespaceIsCorrect(String namespace, CuratorFramework curatorFram
 		if (SaturnSelfNodePath.ROOT_NAME.equals(namespace)) {
 			return false;
 		}
-		return true;
+		try {
+			String executorsPath = "/" + namespace + ExecutorNodePath.getExecutorNodePath();
+			if (curatorFramework.checkExists().forPath(executorsPath) != null) {
+				return true;
+			}
+			String jobsPath = "/" + namespace + JobNodePath.get$JobsNodePath();
+			if (curatorFramework.checkExists().forPath(jobsPath) != null) {
+				return true;
+			}
+			return false;
+		} catch (Exception e) {
+			log.error(e.getMessage(), e);
+			return false;
+		}
 	}
 
 	@Override