Skip to content

N
nodemanager
Commit de654bd0 authored by vicotor's avatar vicotor
Browse files
Options

update nm

parent e23d89f8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
server/taskresult.go
View file @ de654bd0
...@@ -50,7 +50,7 @@ func (wm *WorkerManager) computeTaskResult(worker *Worker, task *odysseus.TaskCo ...@@ -50,7 +50,7 @@ func (wm *WorkerManager) computeTaskResult(worker *Worker, task *odysseus.TaskCo
TaskResultCode: result.TaskResultCode, TaskResultCode: result.TaskResultCode,
TaskError: ErrExecuteFailed.Error(), TaskError: ErrExecuteFailed.Error(),
} }
receipt := wm.makeReceipt(worker, task, result, ErrWorkerFailed) receipt := wm.makeReceipt(worker, task, result, ErrExecuteFailed)
wm.node.PostResult(receipt) wm.node.PostResult(receipt)
go wm.doCallback(task.TaskCallback, taskResponse) go wm.doCallback(task.TaskCallback, taskResponse)
return nil, nil return nil, nil
...@@ -158,7 +158,7 @@ func (wm *WorkerManager) standardTaskResult(worker *Worker, task *odysseus.TaskC ...@@ -158,7 +158,7 @@ func (wm *WorkerManager) standardTaskResult(worker *Worker, task *odysseus.TaskC
//}).Debug("got task result") //}).Debug("got task result")
if result.IsSuccessed == false { if result.IsSuccessed == false {
receipt := wm.makeReceipt(worker, task, result, ErrWorkerFailed) receipt := wm.makeReceipt(worker, task, result, ErrExecuteFailed)
wm.node.PostResult(receipt) wm.node.PostResult(receipt)
return nil, nil return nil, nil
} }
......
server/workerManager.go
View file @ de654bd0
...@@ -395,6 +395,7 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error { ...@@ -395,6 +395,7 @@ func (wm *WorkerManager) manageWorker(worker *Worker) error {
"task": result.TaskId, "task": result.TaskId,
"worker addr": worker.workerAddr, "worker addr": worker.workerAddr,
"success": result.IsSuccessed, "success": result.IsSuccessed,
"result code": result.TaskResultCode,
"duration": result.TaskExecuteDuration / 1000, "duration": result.TaskExecuteDuration / 1000,
}).Info("got result from worker") }).Info("got result from worker")
// verify result and make a new signature. // verify result and make a new signature.
......
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