Commit d1925c9f authored by duanjinfei's avatar duanjinfei

change task handle

parent 551b3882
...@@ -240,30 +240,33 @@ func handlerMsg(nodeManager *models.NodeManagerClient, ...@@ -240,30 +240,33 @@ func handlerMsg(nodeManager *models.NodeManagerClient,
taskMsg := rev.GetPushTaskMessage() taskMsg := rev.GetPushTaskMessage()
if taskMsg != nil { if taskMsg != nil {
if !taskMsgWorker.DockerOp.IsHealthy { go func(msgRespWorker *RespMsgWorker,
params := buildParams(taskMsgWorker.DockerOp.Reason) taskMsgWorker *TaskHandler) {
msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params) if !taskMsgWorker.DockerOp.IsHealthy {
return params := buildParams(taskMsgWorker.DockerOp.Reason)
} msgRespWorker.RegisterMsgResp(nodeManager, worker, GoodbyeResp, params)
taskMsgWorker.Wg.Add(1) return
taskMsgWorker.TaskMsg <- taskMsg }
taskMsgWorker.Wg.Wait() taskMsgWorker.Wg.Add(1)
taskResHeader := taskMsgWorker.TaskRespHeader[taskMsg.TaskUuid] taskMsgWorker.TaskMsg <- taskMsg
taskResBody := taskMsgWorker.TaskRespBody[taskMsg.TaskUuid] taskMsgWorker.Wg.Wait()
isSuccess := taskMsgWorker.TaskIsSuccess[taskMsg.TaskUuid] taskResHeader := taskMsgWorker.TaskRespHeader[taskMsg.TaskUuid]
containerSign := taskMsgWorker.DockerOp.GetContainerSign(taskMsg, taskResBody) taskResBody := taskMsgWorker.TaskRespBody[taskMsg.TaskUuid]
if containerSign == nil || len(containerSign) == 0 { isSuccess := taskMsgWorker.TaskIsSuccess[taskMsg.TaskUuid]
log.Error("Container signing failed................") containerSign := taskMsgWorker.DockerOp.GetContainerSign(taskMsg, taskResBody)
isSuccess = false if containerSign == nil || len(containerSign) == 0 {
} log.Error("Container signing failed................")
reqHash, respHash, minerSign := taskMsgWorker.GetMinerSign(taskMsg, taskResBody) isSuccess = false
params := buildParams(taskMsg.TaskUuid, containerSign, minerSign, taskResHeader, taskResBody, isSuccess) }
taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.ContainerSign, containerSign) reqHash, respHash, minerSign := taskMsgWorker.GetMinerSign(taskMsg, taskResBody)
taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.MinerSign, minerSign) params := buildParams(taskMsg.TaskUuid, containerSign, minerSign, taskResHeader, taskResBody, isSuccess)
taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.ReqHash, reqHash) taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.ContainerSign, containerSign)
taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.RespHash, respHash) taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.MinerSign, minerSign)
msgRespWorker.RegisterMsgResp(nodeManager, worker, SubmitResultResp, params) taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.ReqHash, reqHash)
log.Info(taskMsg) taskMsgWorker.LruCache.Add(taskMsg.TaskUuid+models.RespHash, respHash)
msgRespWorker.RegisterMsgResp(nodeManager, worker, SubmitResultResp, params)
log.Info(taskMsg)
}(msgRespWorker, taskMsgWorker)
} }
nmSignMsg := rev.GetProofTaskResult() nmSignMsg := rev.GetProofTaskResult()
......
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