add wait last task exec timeout

conf/config.go

@@ -9,23 +9,24 @@ import (
 )
 
 type Config struct {
-	SignPrv             string
-	SignPub             string
-	DockerServer        string
-	BenefitAddress      string
-	HeartRespTimeMillis int64
-	ExternalIp          string
-	SignPublicAddress   common.Address
-	SignPrivateKey      *ecdsa.PrivateKey
-	NmSeed              string  `json:"nm_seed"`
-	HeartRespTimeSecond int64   `json:"heart_response"`
-	TaskValidatorTime   float64 `json:"task_validator_time"`
-	ContainerNum        int64   `json:"container_num"`
-	NodeManagerNum      int64   `json:"node_manager_num"`
-	ChainID             int64   `json:"chain_id"`
-	ApiUrl              string  `json:"api_url"`
-	ValidatorUrl        string  `json:"validator_url"`
-	OssUrl              string  `json:"oss_url"`
+	SignPrv              string
+	SignPub              string
+	DockerServer         string
+	BenefitAddress       string
+	HeartRespTimeMillis  int64
+	ExternalIp           string
+	SignPublicAddress    common.Address
+	SignPrivateKey       *ecdsa.PrivateKey
+	NmSeed               string  `json:"nm_seed"`
+	HeartRespTimeSecond  int64   `json:"heart_response"`
+	TaskValidatorTime    float64 `json:"task_validator_time"`
+	ContainerNum         int64   `json:"container_num"`
+	NodeManagerNum       int64   `json:"node_manager_num"`
+	ChainID              int64   `json:"chain_id"`
+	ApiUrl               string  `json:"api_url"`
+	ValidatorUrl         string  `json:"validator_url"`
+	OssUrl               string  `json:"oss_url"`
+	WaitLastTaskExecTime int64   `json:"wait_last_task_exec_time"`
 }
 
 var _cfg *Config = nil

config.json

@@ -7,5 +7,6 @@
   "container_num": 1,
   "chain_id": 100,
   "validator_url": "43.198.29.144:20011",
-  "oss_url": "https://tmp-file.agicoin.ai/api/v1/upload"
+  "oss_url": "https://tmp-file.agicoin.ai/api/v1/upload",
+  "wait_last_task_exec_time": 10
 }
\ No newline at end of file

nm/task_msg.go

@@ -584,7 +584,14 @@ func (t *TaskHandler) checkLastTaskExecStatus(taskMsg *nodeManagerV1.PushTaskMes
 		t.IsExecStandardTask = true
 	}
 	if oldTaskId != taskMsg.TaskId {
+		now := time.Now()
 		for {
+			since := time.Since(now)
+			if int64(since.Seconds()) > conf.GetConfig().WaitLastTaskExecTime {
+				log.WithField("taskId", oldTaskId).Info("Waiting for last task execution ending")
+				oldTaskId = taskMsg.TaskId
+				break
+			}
 			if oldTaskId == "" {
 				oldTaskId = taskMsg.TaskId
 				break