Skip to content

P
power-node
Commit 21422d45 authored by duanjinfei's avatar duanjinfei
Browse files
Options

Merge branch 'master' into test

parents 03fefdab 1fd3bc69
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
nm/task_handler.go
View file @ 21422d45
...@@ -224,8 +224,7 @@ func (t *TaskWorker) GetAckResp(taskMsg *nodeManagerV1.PushTaskMessage) (isCanEx ...@@ -224,8 +224,7 @@ func (t *TaskWorker) GetAckResp(taskMsg *nodeManagerV1.PushTaskMessage) (isCanEx
value, ok := t.ExecTaskIdIsFinished.Load(t.lastExecTaskId) value, ok := t.ExecTaskIdIsFinished.Load(t.lastExecTaskId)
if !ok { if !ok {
log.WithField("task id", t.lastExecTaskId).Warn("task exec is not finished") log.WithField("task id", t.lastExecTaskId).Warn("task exec is not finished")
return } else {
}
isSuccess := value.(bool) isSuccess := value.(bool)
log.WithField("isSuccess", isSuccess).Info("Task exec info") log.WithField("isSuccess", isSuccess).Info("Task exec info")
if !isSuccess && !t.lastExecTaskStartTime.IsZero() { if !isSuccess && !t.lastExecTaskStartTime.IsZero() {
...@@ -236,6 +235,7 @@ func (t *TaskWorker) GetAckResp(taskMsg *nodeManagerV1.PushTaskMessage) (isCanEx ...@@ -236,6 +235,7 @@ func (t *TaskWorker) GetAckResp(taskMsg *nodeManagerV1.PushTaskMessage) (isCanEx
queueWaitTime = lastTaskImageInfo.EstimatExeTime queueWaitTime = lastTaskImageInfo.EstimatExeTime
} }
} }
}
isCanExecute = true isCanExecute = true
modelInfo := t.DockerOp.GetImageInfo(taskCmd.ImageName) modelInfo := t.DockerOp.GetImageInfo(taskCmd.ImageName)
bootUpTime = modelInfo.StartUpTime bootUpTime = modelInfo.StartUpTime
......
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