Commit 64f4a42a authored by duanjinfei's avatar duanjinfei

update reconnect nm problem and start image

parent f054861e
...@@ -44,10 +44,6 @@ func monitorModelInfo(dockerOp *operate.DockerOp) { ...@@ -44,10 +44,6 @@ func monitorModelInfo(dockerOp *operate.DockerOp) {
continue continue
} }
modelInfosResp := resp.Data modelInfosResp := resp.Data
modelInfoMap := make(map[uint64]*models.ModelInfo, 0)
for _, modelInfo := range modelInfosResp {
modelInfoMap[modelInfo.TaskId] = modelInfo
}
imageNameMap, err := dockerOp.PsImageNameMap() imageNameMap, err := dockerOp.PsImageNameMap()
if err != nil { if err != nil {
log.Error("Docker op ps images failed:", err) log.Error("Docker op ps images failed:", err)
......
...@@ -48,7 +48,7 @@ func (o *RespMsgWorker) SendMsg() { ...@@ -48,7 +48,7 @@ func (o *RespMsgWorker) SendMsg() {
if err != nil { if err != nil {
log.Error("Send heartbeat msg error:", err) log.Error("Send heartbeat msg error:", err)
pool.nodeManager.UpdateStatus(false) pool.nodeManager.UpdateStatus(false)
continue return
} }
log.Info("Worker client send message successfully") log.Info("Worker client send message successfully")
} }
......
...@@ -112,19 +112,23 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -112,19 +112,23 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
if tag == taskCmd.ImageName { if tag == taskCmd.ImageName {
imageId = image.ID imageId = image.ID
isFound = true isFound = true
log.Info("The image found success:", image.ID)
break break
} }
} }
log.Println(image.ID) }
if !isFound {
log.Error("The image is not found:", taskCmd.ImageName)
return
} }
containers := t.DockerOp.ListContainer() containers := t.DockerOp.ListContainer()
isImageRunExist := false isImageRunExist := false
for _, container := range containers { for _, container := range containers {
if container.ImageID == imageId { if container.ImageID == imageId && container.Status == "running" {
networks := container.NetworkSettings.Networks networks := container.NetworkSettings.Networks
ip := "" ip := ""
for _, settings := range networks { for _, endPoint := range networks {
ip = settings.IPAddress ip = endPoint.IPAddress
log.Warn("Container network ip:", ip) log.Warn("Container network ip:", ip)
} }
//taskCmd.ApiUrl = fmt.Sprintf(taskCmd.ApiUrl, container.Ports[0].PublicPort) //taskCmd.ApiUrl = fmt.Sprintf(taskCmd.ApiUrl, container.Ports[0].PublicPort)
......
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