vipshop#290 code review commit

he7g · he7g · commit b9ae3935bc60 · 2017-11-17T18:53:07.000+08:00
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/saturn-job-sharding/src/main/java/com/vip/saturn/job/sharding/listener/ExecutorTrafficTriggerShardingListener.java b/saturn-job-sharding/src/main/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/saturn-job-sharding/src/main/java/com/vip/saturn/job/sharding/service/NamespaceShardingService.java b/saturn-job-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));

Original file line number	Diff line number	Diff line change
`@@ -1074,7 +1074,7 @@ protected boolean pick(List<String> allJobs, List<String> allEnableJobs, List<Sh`
`1074`	`1074`	`}`
`1075`	`1075`
`1076`	`1076`	`if (theExecutor == null) {`
`1077`		`- LOGGER.info("The executor {} is offline or already noTraffic, unnecessary to extract traffic", executorName);`
	`1077`	`+ LOGGER.warn("The executor {} maybe offline, unnecessary to extract traffic", executorName);`
`1078`	`1078`	`return false;`
`1079`	`1079`	`}`
`1080`	`1080`
`@@ -1123,7 +1123,7 @@ protected boolean pick(List<String> allJobs, List<String> allEnableJobs, List<Sh`
`1123`	`1123`	`}`
`1124`	`1124`	`}`
`1125`	`1125`	`if (theExecutor == null) {`
`1126`		`- LOGGER.info("The executor {} is offline, unnecessary to recover traffic", executorName);`
	`1126`	`+ LOGGER.warn("The executor {} maybe offline, unnecessary to recover traffic", executorName);`
`1127`	`1127`	`return false;`
`1128`	`1128`	`}`
`1129`	`1129`
`@@ -1696,7 +1696,7 @@ public void asyncShardingWhenExecutorOffline(String executorName) throws Excepti`
`1696`	`1696`	`/**`
`1697`	`1697`	`* 摘取流量`
`1698`	`1698`	`*/`
`1699`		`- public void asyncShardingWhenExecutorExtractTraffic(String executorName) throws Exception {`
	`1699`	`+ public void asyncShardingWhenExtractExecutorTraffic(String executorName) throws Exception {`
`1700`	`1700`	`if (isLeadership()) {`
`1701`	`1701`	`shardingCount.incrementAndGet();`
`1702`	`1702`	`executorService.submit(new ExecuteExtractTrafficShardingTask(executorName));`