add standard task handler

nm/msg_resp.go

@@ -216,7 +216,7 @@ func FetchStandardTaskResp(params ...interface{}) *nodemanagerV1.WorkerMessage {
 	fetchStandardTaskMsgRes := &nodemanagerV1.WorkerMessage{
 		Message: &nodemanagerV1.WorkerMessage_FetchStandardTask{
 			FetchStandardTask: &nodemanagerV1.FetchStandardTask{
-				TaskType: 11,
+				TaskType: 998,
 			},
 		},
 	}

nm/start.go

@@ -198,7 +198,7 @@ func handlerStandardTask(nodeManager *models.NodeManagerClient,
 		noExecAiTaskTime := time.Now()
 		for !taskMsgWorker.IsExecAiTask {
 			since := time.Since(noExecAiTaskTime)
-			if since.Seconds() == 5 {
+			if since.Seconds() == 30 {
 				msgRespWorker.RegisterMsgResp(nodeManager, worker, FetchStandardTaskResp, nil)
 				taskMsgWorker.IsExecStandardTask = true
 				noExecAiTaskTime = time.Now()

nm/task_msg.go

@@ -92,10 +92,7 @@ func (t *TaskHandler) SystemTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
 
 func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) {
 	defer t.Wg.Done()
-	if t.IsExecStandardTask {
-		//todo: 停止标准任务容器
-	}
-	t.IsExecAiTask = true
+
 	t.TaskRespBody[taskMsg.TaskId] = nil
 	t.TaskRespHeader[taskMsg.TaskId] = nil
 	t.TaskExecTime[taskMsg.TaskId] = 0
@@ -108,6 +105,19 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
 		return
 	}
 	log.Info("received task cmd :", taskCmd)
+	if taskMsg.TaskKind == baseV1.TaskKind_ComputeTask {
+		t.IsExecAiTask = true
+		if t.IsExecStandardTask {
+			//todo: 停止标准任务容器
+			containers := t.DockerOp.ListContainer()
+			for _, container := range containers {
+				if container.Image == taskCmd.ImageName && container.State == "running" {
+					t.DockerOp.StopContainer(container.ID)
+				}
+			}
+			t.IsExecStandardTask = false
+		}
+	}
 	images, err := t.DockerOp.PsImages()
 	if err != nil {
 		log.Error("Ps images failed:", err)
@@ -203,7 +213,9 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
 		t.TaskIsSuccess[taskMsg.TaskId] = true
 		t.TaskExecTime[taskMsg.TaskId] = endAfterTaskTime.Microseconds()
 	}
-	t.IsExecAiTask = false
+	if taskMsg.TaskKind == baseV1.TaskKind_ComputeTask {
+		t.IsExecAiTask = false
+	}
 	log.Info("received computeTask--------------------------------")
 }