Commit ee8beadb authored by duanjinfei's avatar duanjinfei

update image name

parent 78aea6ca
......@@ -155,6 +155,7 @@ func (t *TaskWorker) ComputeTaskHandler(taskMsg *nodemanagerV2.PushTaskMessage)
t.ExecTaskIdIsFinished.Store(taskMsg.TaskId, true)
return
}
taskOp.taskCmd.ImageName = fmt.Sprintf("%s-%s", taskOp.taskCmd.ImageName, conf.GetConfig().OpSys)
model, err := db.GetModel(taskOp.taskCmd.ImageName)
if err != nil {
log.Errorf("failed to unmarshal task cmd: %s", err.Error())
......@@ -164,7 +165,6 @@ func (t *TaskWorker) ComputeTaskHandler(taskMsg *nodemanagerV2.PushTaskMessage)
}
model.LastWorkTime = time.Now().Unix()
model.TotalRunCount++
taskOp.taskCmd.ImageName = fmt.Sprintf("%s-%s", taskOp.taskCmd.ImageName, conf.GetConfig().OpSys)
log.Info("received task cmd :", taskOp.taskCmd)
log.WithField("t.lastExecTaskImageName", t.lastExecTaskImageName).WithField("newTaskImageName", taskOp.taskCmd.ImageName).Info("task image info")
if taskMsg.TaskKind != baseV1.TaskKind_StandardTask && conf.GetConfig().IsStopLastContainer {
......@@ -236,6 +236,7 @@ func (t *TaskWorker) GetAckResp(taskMsg *nodemanagerV2.PushTaskMessage) (isCanEx
log.Errorf("failed to unmarshal task cmd: %s", err.Error())
return
}
taskCmd.ImageName = fmt.Sprintf("%s-%s", taskCmd.ImageName, conf.GetConfig().OpSys)
value, ok := t.ExecTaskIdIsFinished.Load(t.lastExecTaskId)
if !ok {
log.WithField("task id", t.lastExecTaskId).Warn("task exec is not 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