merge master

largeModel/model_handler.go

@@ -94,7 +94,7 @@ func (m *ModelHandler) MonitorModelInfo() {
 			if err != nil {
 				log.WithError(err).Error("Error writing models.json")
 			}
-			ticker = time.NewTicker(time.Minute * 10)
+			ticker.Reset(time.Minute * 10)
 		}
 	}
 }

nm/monitor.go

@@ -138,7 +138,7 @@ func (m *MonitorNm) monitorNodeManagerSeed() {
 				nodeManagerArr = append(nodeManagerArr, &NodeManager{Info: node, IsUsed: false, IsExist: true})
 			}
 			m.IsInit = true
-			ticker = time.NewTicker(time.Minute * 10)
+			ticker.Reset(time.Minute * 10)
 		}
 	}
 }

nm/msg_handler.go

@@ -195,7 +195,7 @@ func (n *NodeManagerHandler) ReportResourceMap(dockerOp *operate.DockerOp) {
 				}
 				params := utils.BuildParams(dockerOp.ReportModelIds, bootUpModelIds)
 				n.msgRespWorker.RegisterMsgResp(n.nodeManager, n.worker, SubmitResourceMapRes, params)
-				ticker = time.NewTicker(time.Minute * 10)
+				ticker.Reset(time.Minute * 10)
 			}
 		}
 	}

nm/task_handler.go

@@ -45,7 +45,8 @@ type TaskOp struct {
 	taskParam           *models.TaskParam
 	httpClient          *http.Client
 	request             *http.Request
-	ticker              *time.Ticker
+	waitRunningTicker   *time.Ticker
+	waitReqTicker       *time.Ticker
 	startBeforeTaskTime time.Time
 }
 
@@ -141,7 +142,8 @@ func (t *TaskWorker) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
 		taskParam:           &models.TaskParam{},
 		httpClient:          &http.Client{},
 		request:             &http.Request{},
-		ticker:              time.NewTicker(time.Second * models.DefaultTaskTimer),
+		waitRunningTicker:   time.NewTicker(time.Millisecond),
+		waitReqTicker:       time.NewTicker(time.Millisecond),
 		startBeforeTaskTime: time.Now(),
 	}
 	t.LruCache.Add(taskMsg.TaskId, taskOp.taskExecResult)
@@ -469,7 +471,8 @@ func (op *TaskOp) waitContainerRunning(handler *TaskWorker, imageName string, co
 	log.WithField("maxExecTime", maxExecTime).Info("Waiting for container running", imageName)
 	for {
 		select {
-		case <-op.ticker.C:
+		case <-op.waitRunningTicker.C:
+			op.waitRunningTicker.Reset(time.Second * models.DefaultTaskTimer)
 			if int64(time.Since(op.startBeforeTaskTime).Seconds()) > maxExecTime-50 {
 				log.Errorf("%s", "The maximum execution time for this task has been exceeded")
 				return fmt.Errorf("%s", "The maximum execution time for this task has been exceeded")
@@ -528,7 +531,8 @@ func (op *TaskOp) waitReqContainerOk(dockerOp *operate.DockerOp) error {
 	var err error
 	for {
 		select {
-		case <-op.ticker.C:
+		case <-op.waitReqTicker.C:
+			op.waitReqTicker.Reset(time.Second * models.DefaultTaskTimer)
 			if int64(time.Since(op.startBeforeTaskTime).Seconds()) > maxExecTime-50 {
 				log.Errorf("%s", "The maximum execution time for this task has been exceeded")
 				return fmt.Errorf("%s", "The maximum execution time for this task has been exceeded")