Merge branch 'master' into test

4becf204 · duanjinfei · 21422d45 · 52549856 · 4becf204
Commit 4becf204 authored Apr 17, 2024 by duanjinfei
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

task_handler.go nm/task_handler.go +4 -2

No files found.
--- a/nm/task_handler.go
+++ b/nm/task_handler.go
@@ -238,8 +238,10 @@ func (t *TaskWorker) GetAckResp(taskMsg *nodeManagerV1.PushTaskMessage) (isCanEx
 	}
 	isCanExecute = true
 	modelInfo := t.DockerOp.GetImageInfo(taskCmd.ImageName)
-	bootUpTime = modelInfo.StartUpTime
-	executeTime = modelInfo.EstimatExeTime
+	if modelInfo != nil {
+		bootUpTime = modelInfo.StartUpTime
+		executeTime = modelInfo.EstimatExeTime
+	}
 	return
 }