#295 rest api of restarting executor

Author: IvyLee-cn

saturn-console-api/src/main/java/com/vip/saturn/job/console/domain/ServerBriefInfo.java

@@ -1,12 +1,15 @@
 /**
- * Copyright 2016 vip.com. <p> Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Copyright 2016 vip.com.
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
  *
  * http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
  * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations under the License. </p>
+ * specific language governing permissions and limitations under the License.
+ * </p>
  */
 
 package com.vip.saturn.job.console.domain;
@@ -40,6 +43,8 @@ public final class ServerBriefInfo implements Serializable {
 
 	private boolean isContainer;
 
+	private boolean isRestarting;
+
 	private String groupName;
 
 	public ServerBriefInfo(String executorName) {
@@ -90,6 +95,14 @@ public void setStatus(ServerStatus status) {
 		this.status = status;
 	}
 
+	public boolean isRestarting() {
+		return isRestarting;
+	}
+
+	public void setRestarting(boolean restarting) {
+		isRestarting = restarting;
+	}
+
 	public String getVersion() {
 		return this.version;
 	}

saturn-console-api/src/main/java/com/vip/saturn/job/console/service/helper/SystemConfigProperties.java

@@ -9,6 +9,8 @@ public class SystemConfigProperties {
 
 	public static final String MAX_JOB_NUM = "MAX_JOB_NUM";
 
+	public static final String MAX_SECONDS_FORCE_KILL_EXECUTOR = "MAX_SECONDS_FORCE_KILL_EXECUTOR";
+
 	public static final String CONSOLE_ZK_CLUSTER_MAPPING = "CONSOLE_ZK_CLUSTER_MAPPING";
 
 	public static final String IDC_CONSOLE_DOMAIN_MAPPING = "IDC_CONSOLE_DOMAIN_MAPPING";

saturn-console-api/src/main/java/com/vip/saturn/job/console/service/impl/ExecutorServiceImpl.java

@@ -12,17 +12,19 @@
 import com.vip.saturn.job.console.service.ExecutorService;
 import com.vip.saturn.job.console.service.JobService;
 import com.vip.saturn.job.console.service.RegistryCenterService;
+import com.vip.saturn.job.console.service.SystemConfigService;
+import com.vip.saturn.job.console.service.helper.SystemConfigProperties;
 import com.vip.saturn.job.console.utils.ExecutorNodePath;
 import com.vip.saturn.job.console.utils.JobNodePath;
 import com.vip.saturn.job.console.utils.SaturnConsoleUtils;
-import java.util.List;
-import javax.annotation.Resource;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import javax.annotation.Resource;
+import java.util.List;
+
 /**
  * Default implementation of ExecutorService.
  *
@@ -33,6 +35,8 @@ public class ExecutorServiceImpl implements ExecutorService {
 
 	private static final Logger log = LoggerFactory.getLogger(ExecutorServiceImpl.class);
 
+	private static final int DEFAULT_MAX_SECONDS_FORCE_KILL_EXECUTOR = 300;
+
 	@Resource
 	private CuratorRepository curatorRepository;
 
@@ -42,6 +46,9 @@ public class ExecutorServiceImpl implements ExecutorService {
 	@Resource
 	private RegistryCenterService registryCenterService;
 
+	@Resource
+	private SystemConfigService systemConfigService;
+
 	@Override
 	public List<ServerBriefInfo> getExecutors(String namespace) throws SaturnJobConsoleException {
 		return getExecutors(namespace, null);
@@ -88,6 +95,22 @@ private ServerBriefInfo getServerBriefInfo(String executorName, CuratorFramework
 		} else {
 			executorInfo.setStatus(ServerStatus.OFFLINE);
 		}
+
+		String restartNodePath = ExecutorNodePath.getExecutorRestartNodePath(executorName);
+		long restartTriggerTime = curatorFrameworkOp.getCtime(restartNodePath);
+		long now = System.currentTimeMillis();
+
+		long maxRestartInv = systemConfigService.getIntegerValue(SystemConfigProperties.MAX_SECONDS_FORCE_KILL_EXECUTOR,
+				DEFAULT_MAX_SECONDS_FORCE_KILL_EXECUTOR) * 1000L;
+
+		// 如果executor在线并且restart结点存在，restarting结点存在的时间<300s，executor状态列显示RESTARTING；
+		if (0 != restartTriggerTime && now - restartTriggerTime < maxRestartInv
+				&& ServerStatus.ONLINE.equals(executorInfo.getStatus())) {
+			executorInfo.setRestarting(true);
+		} else {
+			executorInfo.setRestarting(false);
+		}
+
 		// 是否已被摘流量
 		executorInfo.setNoTraffic(curatorFrameworkOp
 				.checkExists(ExecutorNodePath.getExecutorNoTrafficNodePath(executorName)));

saturn-console-api/src/main/resources/system-config-meta.yaml

@@ -8,6 +8,8 @@ job_configs:
 executor_configs:
     - name: ALARM_RAISED_ON_EXECUTOR_RESTART
       desc_zh: executor restart是否发送告警
+    - name: MAX_SECONDS_FORCE_KILL_EXECUTOR
+      desc_zh: executor stop时最长等待时间
 
 cluster_configs:
     - name: CONSOLE_ZK_CLUSTER_MAPPING