#290 code review commit

vipshop · Nov 17, 2017 · b9ae393 · b9ae393
1 parent 284d983
commit b9ae393
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/saturn-it/src/test/java/com/vip/saturn/it/impl/ShardingWithTrafficIT.java b/saturn-it/src/test/java/com/vip/saturn/it/impl/ShardingWithTrafficIT.java
@@ -47,8 +47,8 @@ public static void tearDown() throws Exception {
      */
     @Test
     public void test_A_NormalFlow() throws Exception {
-        String jobName = "test_A_Extract";
-        String jobName2 = "test_A_Extract2";
+        String jobName = "test_A_NormalFlow";
+        String jobName2 = "test_A_NormalFlow2";
 
         final JobConfiguration jobConfiguration = new JobConfiguration(jobName);
         jobConfiguration.setCron("* * * * * ? 2099");

diff --git a/...ain/java/com/vip/saturn/job/sharding/listener/ExecutorTrafficTriggerShardingListener.java b/...ain/java/com/vip/saturn/job/sharding/listener/ExecutorTrafficTriggerShardingListener.java
@@ -23,7 +23,7 @@ public void childEvent(Type type, String path, String nodeData) throws Exception
         try {
             if (isExecutorNoTraffic(type, path)) {
                 String executorName = SaturnExecutorsNode.getExecutorNameByNoTrafficPath(path);
-                namespaceShardingService.asyncShardingWhenExecutorExtractTraffic(executorName);
+                namespaceShardingService.asyncShardingWhenExtractExecutorTraffic(executorName);
             } else if (isExecutorTraffic(type, path)) {
                 String executorName = SaturnExecutorsNode.getExecutorNameByNoTrafficPath(path);
                 namespaceShardingService.asyncShardingWhenRecoverExecutorTraffic(executorName);

diff --git a/...-sharding/src/main/java/com/vip/saturn/job/sharding/service/NamespaceShardingService.java b/...-sharding/src/main/java/com/vip/saturn/job/sharding/service/NamespaceShardingService.java
@@ -1074,7 +1074,7 @@ protected boolean pick(List<String> allJobs, List<String> allEnableJobs, List<Sh
 			}
 
 			if (theExecutor == null) {
-				LOGGER.info("The executor {} is offline or already noTraffic, unnecessary to extract traffic", executorName);
+				LOGGER.warn("The executor {} maybe offline, unnecessary to extract traffic", executorName);
 				return false;
 			}
 
@@ -1123,7 +1123,7 @@ protected boolean pick(List<String> allJobs, List<String> allEnableJobs, List<Sh
 				}
 			}
 			if (theExecutor == null) {
-				LOGGER.info("The executor {} is offline, unnecessary to recover traffic", executorName);
+				LOGGER.warn("The executor {} maybe offline, unnecessary to recover traffic", executorName);
 				return false;
 			}
 
@@ -1696,7 +1696,7 @@ public void asyncShardingWhenExecutorOffline(String executorName) throws Excepti
 	/**
 	 * 摘取流量
 	 */
-	public void asyncShardingWhenExecutorExtractTraffic(String executorName) throws Exception {
+	public void asyncShardingWhenExtractExecutorTraffic(String executorName) throws Exception {
 		if (isLeadership()) {
 			shardingCount.incrementAndGet();
 			executorService.submit(new ExecuteExtractTrafficShardingTask(executorName));