Commit c4bd5828 authored by vicotor's avatar vicotor

add log

parent ef19c1cd
...@@ -144,7 +144,7 @@ func (n *Node) Loop(idx int) { ...@@ -144,7 +144,7 @@ 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-id", task.TaskId) l := log.WithField("task-uuid", task.TaskUuid)
l.WithField("task", task).Info("get task") l.WithField("task", task).Info("get task")
for { for {
worker, err := PopWorker(n.rdb) worker, err := PopWorker(n.rdb)
...@@ -174,7 +174,7 @@ func (n *Node) Loop(idx int) { ...@@ -174,7 +174,7 @@ func (n *Node) Loop(idx int) {
l.WithError(err).Error("dispatch task failed") l.WithError(err).Error("dispatch task failed")
continue continue
} else { } else {
l.WithField("task-id", task.TaskId).Info("dispatch task success") l.Info("dispatch task success")
break break
} }
} }
......
...@@ -32,12 +32,16 @@ func PopWorker(rdb *redis.Client) (Worker, error) { ...@@ -32,12 +32,16 @@ func PopWorker(rdb *redis.Client) (Worker, error) {
for i := 0; i < maxPriority; i++ { for i := 0; i < maxPriority; i++ {
elem, err := rdb.LPop(context.Background(), config.WORKER_QUEUE_PREFIX+strconv.Itoa(i)).Result() elem, err := rdb.LPop(context.Background(), config.WORKER_QUEUE_PREFIX+strconv.Itoa(i)).Result()
if err != nil { if err != nil {
log.WithError(err).Error("lPop worker failed")
continue continue
} }
log.WithField("elem", elem).Debug("lPop worker")
managerList, err := rdb.SMembers(context.Background(), config.WORKER_STATUS_PREFIX+elem).Result() managerList, err := rdb.SMembers(context.Background(), config.WORKER_STATUS_PREFIX+elem).Result()
if err != nil { if err != nil {
log.WithError(err).Error("get worker status failed")
continue continue
} }
log.WithField("managerList", managerList).Debug("get worker status")
if len(managerList) == 0 { if len(managerList) == 0 {
continue continue
} }
...@@ -66,6 +70,7 @@ func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error ...@@ -66,6 +70,7 @@ func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error
} }
func DispatchTask(worker Worker, task *odysseus.TaskContent) error { func DispatchTask(worker Worker, task *odysseus.TaskContent) error {
for _, manager := range worker.managers { for _, manager := range worker.managers {
client, err := newManagerClient(manager) client, err := newManagerClient(manager)
if err != nil { if err != nil {
......
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