Commit f07757b3 authored by duanjinfei's avatar duanjinfei

update reconn nm

parent a4788655
...@@ -96,15 +96,16 @@ func StartMonitor() { ...@@ -96,15 +96,16 @@ func StartMonitor() {
} }
if !managerClient.IsDel { if !managerClient.IsDel {
// TODO: 重试连接三次 // TODO: 重试连接三次
managerClient.UpdateLastHeartTime(time.Now()) //managerClient.UpdateLastHeartTime(time.Now())
isSuccess := inputNodeManagerChan(manager, managerClient, managerClient.IsSelected, monitorNm) 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) log.WithField("is success", isSuccess).Warn("Try to connect node manager client:", manager.Info.Endpoint)
if isSuccess { if isSuccess {
log.Info("Connect node manager client success:", manager.Info.Endpoint) log.Info("Connect node manager client success:", manager.Info.Endpoint)
continue continue
} }
} }
managerClient.IsDel = true //managerClient.IsDel = true
log.WithField("Endpoint", managerClient.Endpoint).Warn("Node manager client is deleted") log.WithField("Endpoint", managerClient.Endpoint).Warn("Node manager client is deleted")
unUsedNodeManagers := getUnUsedNodeManagers() unUsedNodeManagers := getUnUsedNodeManagers()
if unUsedNodeManagers == nil || len(unUsedNodeManagers) == 0 { if unUsedNodeManagers == nil || len(unUsedNodeManagers) == 0 {
......
...@@ -144,6 +144,9 @@ func MatchFileCacheQueryString(params map[string][]string, taskImageName string, ...@@ -144,6 +144,9 @@ func MatchFileCacheQueryString(params map[string][]string, taskImageName string,
isModelExistFileExpires := false isModelExistFileExpires := false
if !isExistFileExpires { if !isExistFileExpires {
for _, info := range modelsInfo { for _, info := range modelsInfo {
if info == nil {
continue
}
if info.ImageName == taskImageName && info.FileExpiresTime != "" { if info.ImageName == taskImageName && info.FileExpiresTime != "" {
values.Add(models.ResultFileExpiresDB, info.FileExpiresTime) values.Add(models.ResultFileExpiresDB, info.FileExpiresTime)
isModelExistFileExpires = true isModelExistFileExpires = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment