Merge branch 'master' into test

nm/start.go

@@ -79,7 +79,7 @@ func StartMonitor() {
 			for _, client := range usedNodeManagerClient {
 				log.WithField("Endpoint", client.Endpoint).WithField("LastHeartTime", client.LastHeartTime).WithField("Is Del", client.IsDel).WithField("Status", client.Status).Info("Monitoring node manager client thread")
 			}
-			for _, managerClient := range usedNodeManagerClient {
+			for i, managerClient := range usedNodeManagerClient {
 				if managerClient.GetStatus() && !managerClient.IsDel {
 					sub := time.Now().Sub(managerClient.GetLastHeartTime()).Seconds()
 					log.WithField("time(uint seconds)", sub).Info("Main thread monitor nm heartbeat time")
@@ -103,6 +103,7 @@ func StartMonitor() {
 						log.Info("Connect node manager client success:", manager.Info.Endpoint)
 						continue
 					}
+					usedNodeManagerClient = utils.DeleteNm(usedNodeManagerClient, i)
 					//managerClient.IsDel = true
 					log.WithField("Endpoint", managerClient.Endpoint).Warn("Node manager client is deleted")
 					unUsedNodeManagers := getUnUsedNodeManagers()

utils/util.go

@@ -212,3 +212,8 @@ func CloneRequest(r *http.Request) *http.Request {
 	}
 	return copiedRequest
 }
+
+func DeleteNm(nodeArr []*models.NodeManagerClient, target int) []*models.NodeManagerClient {
+	nodeArr[target] = nodeArr[len(nodeArr)-1]
+	return nodeArr[:len(nodeArr)-1]
+}