Commit 3a993422 authored by duanjinfei's avatar duanjinfei

add nm heartbeat time monitor

parent 9cd19d68
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
"example.com/m/operate" "example.com/m/operate"
"example.com/m/utils" "example.com/m/utils"
"example.com/m/validator" "example.com/m/validator"
"fmt"
nodeManagerV1 "github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v1" nodeManagerV1 "github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v1"
"google.golang.org/grpc" "google.golang.org/grpc"
"time" "time"
...@@ -100,7 +99,7 @@ func StartMonitor() { ...@@ -100,7 +99,7 @@ func StartMonitor() {
if !managerClient.IsDel { if !managerClient.IsDel {
// TODO: 重试连接三次 // TODO: 重试连接三次
isSuccess := inputNodeManagerChan(manager, managerClient, managerClient.IsSelected) isSuccess := inputNodeManagerChan(manager, managerClient, managerClient.IsSelected)
log.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
...@@ -209,8 +208,8 @@ func monitorWorker(op *operate.DockerOp) { ...@@ -209,8 +208,8 @@ func monitorWorker(op *operate.DockerOp) {
rev, err := worker.Recv() rev, err := worker.Recv()
if int64(sub) > conf.GetConfig().HeartRespTimeSecond || err != nil { if int64(sub) > conf.GetConfig().HeartRespTimeSecond || err != nil {
log.Error("Rev failed:", err) log.Error("Rev failed:", err)
params := buildParams(fmt.Sprint("Rev failed:", err)) //params := buildParams(fmt.Sprint("Rev failed:", err))
msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params) //msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params)
nodeManager.UpdateStatus(false) nodeManager.UpdateStatus(false)
log.Error("Node manager heartbeat is over") log.Error("Node manager heartbeat is over")
return return
...@@ -273,8 +272,8 @@ func handlerMsg(nodeManager *models.NodeManagerClient, ...@@ -273,8 +272,8 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
go func(msgRespWorker *RespMsgWorker, go func(msgRespWorker *RespMsgWorker,
taskMsgWorker *TaskHandler, taskMsg *nodeManagerV1.PushTaskMessage) { taskMsgWorker *TaskHandler, taskMsg *nodeManagerV1.PushTaskMessage) {
if !taskMsgWorker.DockerOp.IsHealthy { if !taskMsgWorker.DockerOp.IsHealthy {
params := buildParams(taskMsgWorker.DockerOp.Reason) //params := buildParams(taskMsgWorker.DockerOp.Reason)
msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params) //msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params)
return return
} }
taskMsgWorker.Wg.Add(1) taskMsgWorker.Wg.Add(1)
......
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