Commit b4b5057f authored by duanjinfei's avatar duanjinfei

add conditon task kind

parent 59f12f26
...@@ -202,7 +202,6 @@ func handlerStandardTask(nodeManager *models.NodeManagerClient, ...@@ -202,7 +202,6 @@ func handlerStandardTask(nodeManager *models.NodeManagerClient,
} }
if !taskMsgWorker.IsExecAiTask { if !taskMsgWorker.IsExecAiTask {
msgRespWorker.RegisterMsgResp(nodeManager, worker, FetchStandardTaskResp, nil) msgRespWorker.RegisterMsgResp(nodeManager, worker, FetchStandardTaskResp, nil)
taskMsgWorker.IsExecStandardTask = true
break break
} }
} }
......
...@@ -105,6 +105,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -105,6 +105,7 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
return return
} }
log.Info("received task cmd :", taskCmd) log.Info("received task cmd :", taskCmd)
if taskMsg.TaskKind == baseV1.TaskKind_ComputeTask { if taskMsg.TaskKind == baseV1.TaskKind_ComputeTask {
t.IsExecAiTask = true t.IsExecAiTask = true
if t.IsExecStandardTask { if t.IsExecStandardTask {
...@@ -117,6 +118,8 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -117,6 +118,8 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
t.IsExecStandardTask = false t.IsExecStandardTask = false
} }
} else if taskMsg.TaskKind == baseV1.TaskKind_StandardTask {
t.IsExecStandardTask = true
} }
images, err := t.DockerOp.PsImages() images, err := t.DockerOp.PsImages()
if err != nil { if err != nil {
...@@ -215,6 +218,8 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage) ...@@ -215,6 +218,8 @@ func (t *TaskHandler) ComputeTaskHandler(taskMsg *nodeManagerV1.PushTaskMessage)
} }
if taskMsg.TaskKind == baseV1.TaskKind_ComputeTask { if taskMsg.TaskKind == baseV1.TaskKind_ComputeTask {
t.IsExecAiTask = false t.IsExecAiTask = false
} else if taskMsg.TaskKind == baseV1.TaskKind_StandardTask {
t.IsExecStandardTask = false
} }
log.Info("received computeTask--------------------------------") log.Info("received computeTask--------------------------------")
} }
......
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