Commit 5d2a9bec authored by vicotor's avatar vicotor

update

parent 5a501677
...@@ -10,17 +10,20 @@ import ( ...@@ -10,17 +10,20 @@ import (
) )
type dispatchTask struct { type dispatchTask struct {
worker *Worker create time.Time
task *odysseus.TaskContent resultTime time.Time
status TaskStatus worker *Worker
ack chan interface{} task *odysseus.TaskContent
errCh chan error status TaskStatus
mux sync.Mutex ack chan interface{}
result chan *omanager.SubmitTaskResult errCh chan error
mux sync.Mutex
result chan *omanager.SubmitTaskResult
} }
func newDispatchTask(w *Worker, task *odysseus.TaskContent) *dispatchTask { func newDispatchTask(w *Worker, task *odysseus.TaskContent) *dispatchTask {
return &dispatchTask{ return &dispatchTask{
create: time.Now(),
worker: w, worker: w,
task: task, task: task,
status: TASK_CREATE, status: TASK_CREATE,
...@@ -98,7 +101,6 @@ func (d *dispatchTask) finalize(wm *WorkerManager) { ...@@ -98,7 +101,6 @@ func (d *dispatchTask) finalize(wm *WorkerManager) {
var result *omanager.SubmitTaskResult var result *omanager.SubmitTaskResult
select { select {
case <-ticker.C: case <-ticker.C:
l.WithField("worker", d.worker.workerAddr).Info("task timeout")
d.setStatus(TASK_TIMEOUT) d.setStatus(TASK_TIMEOUT)
result = &omanager.SubmitTaskResult{ result = &omanager.SubmitTaskResult{
TaskId: d.task.TaskId, TaskId: d.task.TaskId,
...@@ -108,10 +110,14 @@ func (d *dispatchTask) finalize(wm *WorkerManager) { ...@@ -108,10 +110,14 @@ func (d *dispatchTask) finalize(wm *WorkerManager) {
} }
case r := <-d.result: case r := <-d.result:
l.WithField("worker", d.worker.workerAddr).Info("task finished")
d.setStatus(TASK_FINISHED) d.setStatus(TASK_FINISHED)
result = r result = r
} }
d.resultTime = time.Now()
l.WithFields(log.Fields{
"totaltime": d.resultTime.Sub(d.create).Milliseconds(),
"status": d.status,
}).Debug("task finished")
task := d.task task := d.task
if task.TaskKind != odysseus.TaskKind_StandardTask && d.worker.online == true { if task.TaskKind != odysseus.TaskKind_StandardTask && d.worker.online == true {
......
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