Commit 833c00bc authored by duanjinfei's avatar duanjinfei

Merge branch 'master' into test

parents e187b276 5ac9e2e0
...@@ -117,7 +117,9 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -117,7 +117,9 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
log.Info("received task cmd :", taskCmd) log.Info("received task cmd :", taskCmd)
log.WithField("oldTaskImageName", oldTaskImageName).WithField("newTaskImageName", taskCmd.ImageName).Info("task image info") log.WithField("oldTaskImageName", oldTaskImageName).WithField("newTaskImageName", taskCmd.ImageName).Info("task image info")
t.checkIsStopContainer(taskCmd) if taskMsg.TaskKind != baseV1.TaskKind_StandardTask {
t.checkIsStopContainer(taskCmd)
}
log.Info("check is stop container finished") log.Info("check is stop container finished")
isFound, imageId := t.foundTaskImage(taskExecResult, taskCmd, taskMsg) isFound, imageId := t.foundTaskImage(taskExecResult, taskCmd, taskMsg)
log.Info("found task image finished") log.Info("found task image finished")
......
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