Commit d00123cd authored by vicotor's avatar vicotor

fix bug

parent 03496321
...@@ -3,6 +3,7 @@ package server ...@@ -3,6 +3,7 @@ package server
import ( import (
"context" "context"
"errors" "errors"
"fmt"
odysseus "github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1" odysseus "github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
omanager "github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v1" omanager "github.com/odysseus/odysseus-protocol/gen/proto/go/nodemanager/v1"
"github.com/odysseus/scheduler/config" "github.com/odysseus/scheduler/config"
...@@ -37,7 +38,7 @@ func PopWorker(rdb *redis.Client) (Worker, error) { ...@@ -37,7 +38,7 @@ func PopWorker(rdb *redis.Client) (Worker, error) {
break break
} }
log.WithField("elem", elem).Debug("lPop worker") 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(), workerStatusKey(elem)).Result()
if err != nil { if err != nil {
log.WithError(err).Error("get worker status failed") log.WithError(err).Error("get worker status failed")
continue continue
...@@ -56,6 +57,9 @@ func PopWorker(rdb *redis.Client) (Worker, error) { ...@@ -56,6 +57,9 @@ func PopWorker(rdb *redis.Client) (Worker, error) {
} }
return Worker{}, ErrNoWorker return Worker{}, ErrNoWorker
} }
func workerStatusKey(wid string) string {
return fmt.Sprintf("%s_%s", config.WORKER_STATUS_PREFIX, wid)
}
func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error) { func newManagerClient(endpoint string) (omanager.NodeManagerServiceClient, error) {
client, err := grpc.Dial(endpoint, client, err := grpc.Dial(endpoint,
......
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