Merge branch 'master' into test

nm/start.go

@@ -94,16 +94,14 @@ func StartMonitor() {
 						log.Warn("The managerClient is not exist:", managerClient.Endpoint)
 						continue
 					}
-					if !managerClient.IsDel {
-						// TODO: 重试连接三次
-						//managerClient.UpdateLastHeartTime(time.Now())
-						managerClient.IsDel = true
-						isSuccess := inputNodeManagerChan(manager, nil, managerClient.IsSelected, monitorNm)
-						log.WithField("is success", isSuccess).Warn("Try to connect node manager client:", manager.Info.Endpoint)
-						if isSuccess {
-							log.Info("Connect node manager client success:", manager.Info.Endpoint)
-							continue
-						}
+					// TODO: 重试连接三次
+					//managerClient.UpdateLastHeartTime(time.Now())
+					managerClient.IsDel = true
+					isSuccess := inputNodeManagerChan(manager, nil, managerClient.IsSelected, monitorNm)
+					log.WithField("is success", isSuccess).Warn("Try to connect node manager client:", manager.Info.Endpoint)
+					if isSuccess {
+						log.Info("Connect node manager client success:", manager.Info.Endpoint)
+						continue
 					}
 					//managerClient.IsDel = true
 					log.WithField("Endpoint", managerClient.Endpoint).Warn("Node manager client is deleted")