Commit 988f5810 authored by vicotor's avatar vicotor

update protocol

parent 7211cda0
...@@ -112,9 +112,9 @@ func (n *Node) Loop(idx int) { ...@@ -112,9 +112,9 @@ func (n *Node) Loop(idx int) {
} }
postReceipt := func(task *odysseus.TaskContent, result *odysseus.TaskResponse, err error) error { postReceipt := func(task *odysseus.TaskContent, result *odysseus.TaskResponse, err error) error {
receipt := new(odysseus.TaskReceipt) receipt := new(odysseus.TaskReceipt)
receipt.TaskUuid = task.TaskUuid
receipt.TaskTimestamp = task.TaskTimestamp
receipt.TaskId = task.TaskId receipt.TaskId = task.TaskId
receipt.TaskTimestamp = task.TaskTimestamp
receipt.TaskType = task.TaskType
receipt.TaskUid = task.TaskUid receipt.TaskUid = task.TaskUid
receipt.TaskWorkload = task.TaskWorkload receipt.TaskWorkload = task.TaskWorkload
receipt.TaskDuration = (time.Now().UnixNano() - int64(task.TaskTimestamp)) / 1000 receipt.TaskDuration = (time.Now().UnixNano() - int64(task.TaskTimestamp)) / 1000
...@@ -144,13 +144,14 @@ func (n *Node) Loop(idx int) { ...@@ -144,13 +144,14 @@ func (n *Node) Loop(idx int) {
case t := <-taskCh: case t := <-taskCh:
go func(task *odysseus.TaskContent) { go func(task *odysseus.TaskContent) {
l := log.WithField("task-uuid", task.TaskUuid) l := log.WithField("task-id", task.TaskId)
l.WithField("task", task).Info("get task") l.WithField("task", task).Info("get task")
// todo: add parameter for re-dispatch count.
for { for {
worker, err := PopWorker(n.rdb) worker, err := PopWorker(n.rdb)
if err == ErrNoWorker { if err == ErrNoWorker {
result := &odysseus.TaskResponse{ result := &odysseus.TaskResponse{
TaskUuid: task.TaskUuid, TaskId: task.TaskId,
TaskUid: task.TaskUid, TaskUid: task.TaskUid,
TaskFee: task.TaskFee, TaskFee: task.TaskFee,
TaskIsSucceed: false, TaskIsSucceed: false,
......
...@@ -72,7 +72,7 @@ func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error ...@@ -72,7 +72,7 @@ func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error
} }
func DispatchTask(worker Worker, task *odysseus.TaskContent) error { func DispatchTask(worker Worker, task *odysseus.TaskContent) error {
l := log.WithField("task-uuid", task.TaskUuid) l := log.WithField("task-id", task.TaskId)
l.WithFields(log.Fields{ l.WithFields(log.Fields{
"worker": worker.workerid, "worker": worker.workerid,
"managerList": worker.managers, "managerList": worker.managers,
......
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