Merge remote-tracking branch 'origin/hotfix-1.1.12' into hotfix-1.2.7

Author: 李浩

pom.xml

@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>devops-service</artifactId>
-    <version>1.2.6.RELEASE</version>
+    <version>1.2.7.RELEASE</version>
     <packaging>jar</packaging>
     <url>https://github.com/open-hand/devops-service</url>
 

src/main/java/io/choerodon/devops/api/ws/host/HostAgentSocketHandler.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import javax.annotation.PostConstruct;
 import org.hzero.websocket.constant.ClientWebSocketConstant;
 import org.hzero.websocket.vo.MsgVO;
@@ -39,6 +40,8 @@
 public class HostAgentSocketHandler extends AbstractSocketHandler {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(HostAgentSocketHandler.class);
+    private static final String C7N_AGENT_UPGRADE_COUNT_REDIS_KEY = "host:%s";
+    private static final Integer C7N_AGENT_MAX_UPGRADE_ATTEMPT_COUNT = 3;
 
     private final Map<String, HostMsgHandler> hostMsgHandlerMap = new HashMap<>();
 
@@ -79,18 +82,32 @@ public void afterConnectionEstablished(WebSocketSession session) {
         hostSessionVO.setRegisterKey(WebSocketTool.getGroup(session));
         redisTemplate.opsForHash().put(DevopsHostConstants.HOST_SESSION, hostSessionVO.getRegisterKey(), hostSessionVO);
 
-        MsgVO msgVO = new MsgVO();
+        MsgVO msgVO;
         // 版本不一致，需要升级
         if (!agentVersion.equals(WebSocketTool.getVersion(session))) {
-            DevopsHostDTO devopsHostDTO = devopsHostService.baseQuery(Long.parseLong(hostId));
-            HostMsgVO hostMsgVO = new HostMsgVO();
-            hostMsgVO.setType(HostCommandEnum.UPGRADE_AGENT.value());
-            Map<String, String> upgradeInfo = new HashMap<>();
-            upgradeInfo.put("upgradeCommand", devopsHostService.queryShell(devopsHostDTO.getProjectId(), devopsHostDTO.getId(), true));
-            upgradeInfo.put("version", agentVersion);
-            hostMsgVO.setPayload(JsonHelper.marshalByJackson(upgradeInfo));
-
-            msgVO = (new MsgVO()).setGroup(DevopsHostConstants.GROUP + hostId).setKey(HostCommandEnum.UPGRADE_AGENT.value()).setMessage(JsonHelper.marshalByJackson(hostMsgVO)).setType(ClientWebSocketConstant.SendType.S_GROUP);
+            String redisKey = String.format(C7N_AGENT_UPGRADE_COUNT_REDIS_KEY, hostId);
+            Integer count = (Integer) redisTemplate.opsForValue().get(redisKey);
+            if (C7N_AGENT_MAX_UPGRADE_ATTEMPT_COUNT.equals(count)) {
+                // 表示agent进行了3次尝试升级，都失败了，那么agent应该退出。手动处理升级失败问题
+                HostMsgVO hostMsgVO = new HostMsgVO();
+                hostMsgVO.setType(HostCommandEnum.EXIT_AGENT.value());
+                hostMsgVO.setPayload("{}");
+                msgVO = (new MsgVO()).setGroup(DevopsHostConstants.GROUP + hostId).setKey(HostCommandEnum.EXIT_AGENT.value()).setMessage(JsonHelper.marshalByJackson(hostMsgVO)).setType(ClientWebSocketConstant.SendType.S_GROUP);
+            } else {
+                if (count == null) {
+                    count = 0;
+                }
+                count++;
+                redisTemplate.opsForValue().set(redisKey, count, 1800, TimeUnit.SECONDS);
+                DevopsHostDTO devopsHostDTO = devopsHostService.baseQuery(Long.parseLong(hostId));
+                HostMsgVO hostMsgVO = new HostMsgVO();
+                hostMsgVO.setType(HostCommandEnum.UPGRADE_AGENT.value());
+                Map<String, String> upgradeInfo = new HashMap<>();
+                upgradeInfo.put("upgradeCommand", devopsHostService.queryShell(devopsHostDTO.getProjectId(), devopsHostDTO.getId(), true));
+                upgradeInfo.put("version", agentVersion);
+                hostMsgVO.setPayload(JsonHelper.marshalByJackson(upgradeInfo));
+                msgVO = (new MsgVO()).setGroup(DevopsHostConstants.GROUP + hostId).setKey(HostCommandEnum.UPGRADE_AGENT.value()).setMessage(JsonHelper.marshalByJackson(hostMsgVO)).setType(ClientWebSocketConstant.SendType.S_GROUP);
+            }
         } else {
             HostMsgVO hostMsgVO = new HostMsgVO();
             hostMsgVO.setType(HostCommandEnum.INIT_AGENT.value());

src/main/java/io/choerodon/devops/app/service/impl/DevopsHostServiceImpl.java

@@ -72,7 +72,7 @@ public class DevopsHostServiceImpl implements DevopsHostService {
     private static final String ERROR_HOST_STATUS_IS_NOT_DISCONNECT = "error.host.status.is.not.disconnect";
     private static final String LOGIN_NAME = "loginName";
     private static final String REAL_NAME = "realName";
-    private static final String HOST_AGENT = "curl -o host.sh %s/devops/v1/projects/%d/hosts/%d/download_file/%s && sh host.sh";
+    private static final String HOST_AGENT = "curl -Lo host.sh %s/devops/v1/projects/%d/hosts/%d/download_file/%s && sh host.sh";
     private static final String HOST_UNINSTALL_SHELL = "ps -ef|grep c7n-agent | grep -v grep |awk '{print  $2}' |xargs kill -9";
     private static final String HOST_ACTIVATE_COMMAND_TEMPLATE;
 

src/main/java/io/choerodon/devops/infra/enums/host/HostCommandEnum.java

@@ -28,6 +28,7 @@ public enum HostCommandEnum {
     KILL_MIDDLEWARE("kill_middleware"),
     INIT_AGENT("init_agent"),
     UPGRADE_AGENT("upgrade_agent"),
+    EXIT_AGENT("exit_agent"),
     INIT_AGENT_FAILED("init_agent_failed"),
     /**
      * 该事件返回command结果

src/main/resources/shell/host.sh

@@ -31,7 +31,7 @@ AGENT_LOG=$WORK_DIR/${AGENT_NAME}.log
 # 3. 下载执行程序
 tar_file=${WORK_DIR}/c7n-agent.tar.gz
 echo "Downloading c7n-agent"
-curl -o ${tar_file} "{{ BINARY }}"
+curl -Lo ${tar_file} "{{ BINARY }}"
 tar -zxvf ${tar_file}
 echo "c7n-agent downloaded successfully"