Commit 694ee11f authored by duanjinfei's avatar duanjinfei

update nm is conn failed handler

parent b27765f2
...@@ -85,6 +85,9 @@ func reportModelInfo(nodeManager *models.NodeManagerClient, ...@@ -85,6 +85,9 @@ func reportModelInfo(nodeManager *models.NodeManagerClient,
for { for {
select { select {
case taskId := <-dockerOp.ModelTaskIdChan: case taskId := <-dockerOp.ModelTaskIdChan:
if !nodeManager.Status {
return
}
params := buildParams(taskId) params := buildParams(taskId)
msgRespWorker.RegisterMsgResp(nodeManager, worker, SubmitResourceMapRes, params) msgRespWorker.RegisterMsgResp(nodeManager, worker, SubmitResourceMapRes, params)
} }
......
...@@ -47,7 +47,6 @@ func (o *RespMsgWorker) SendMsg() { ...@@ -47,7 +47,6 @@ func (o *RespMsgWorker) SendMsg() {
err := pool.workerClient.SendMsg(workerMsg) err := pool.workerClient.SendMsg(workerMsg)
if err != nil { if err != nil {
log.Error("Send heartbeat msg error:", err) log.Error("Send heartbeat msg error:", err)
pool.nodeManager.UpdateStatus(false)
return return
} }
log.Info("Worker client send message successfully") log.Info("Worker client send message successfully")
......
...@@ -156,9 +156,11 @@ func monitorWorker(op *operate.DockerOp) { ...@@ -156,9 +156,11 @@ func monitorWorker(op *operate.DockerOp) {
rev, err := worker.Recv() rev, err := worker.Recv()
if err == io.EOF { if err == io.EOF {
log.Errorf("Node manage not work endpoint:%s", nodeManager.Endpoint) log.Errorf("Node manage not work endpoint:%s", nodeManager.Endpoint)
nodeManager.UpdateStatus(false)
params := buildParams(fmt.Sprintf("Node manage not work endpoint:%s", nodeManager.Endpoint)) params := buildParams(fmt.Sprintf("Node manage not work endpoint:%s", nodeManager.Endpoint))
msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params) msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params)
if nodeManager.Status {
nodeManager.UpdateStatus(false)
}
return return
} }
if err != nil { if err != nil {
...@@ -187,6 +189,9 @@ func handlerMsg(nodeManager *models.NodeManagerClient, ...@@ -187,6 +189,9 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
select { select {
case rev := <-nodeManagerMsgChan: case rev := <-nodeManagerMsgChan:
{ {
if !nodeManager.Status {
return
}
heartbeatReq := rev.GetHeartbeatRequest() heartbeatReq := rev.GetHeartbeatRequest()
if heartbeatReq != nil { if heartbeatReq != nil {
nodeManager.UpdateLastHeartTime(int64(heartbeatReq.Timestamp)) nodeManager.UpdateLastHeartTime(int64(heartbeatReq.Timestamp))
......
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