fix bug

server/node.go

@@ -10,6 +10,7 @@ import (
 	"github.com/odysseus/cache/model"
 	odysseus "github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
 	"github.com/odysseus/scheduler/config"
+	"github.com/odysseus/scheduler/types"
 	"github.com/odysseus/scheduler/utils"
 	"github.com/odysseus/scheduler/workerpoper"
 	"github.com/odysseus/service-registry/common"
@@ -183,7 +184,7 @@ func (n *Node) postReceipt(task *odysseus.TaskContent, result *odysseus.TaskResp
 	receipt.TaskProfitAccount = ""
 	receipt.TaskWorkerAccount = ""
 	switch err {
-	case ErrNoWorker, ErrTimeout:
+	case types.ErrNoWorker, types.ErrTimeout:
 		receipt.TaskResult = err.Error()
 	case ErrDispatchFailed:
 		receipt.TaskResult = err.Error()
@@ -239,7 +240,7 @@ func (n *Node) Loop(idx int) {
 					failed := make(map[string]bool)
 					for {
 						worker, err := n.poper.PopWorker(ctx, n.rdb, t, failed)
-						if err == workerpoper.ErrNoWorker || err == workerpoper.ErrTimeout {
+						if err == types.ErrNoWorker || err == types.ErrTimeout {
 							result := &odysseus.TaskResponse{
 								TaskId:        task.TaskId,
 								TaskUid:       task.TaskUid,

server/worker.go

@@ -84,7 +84,7 @@ func (n *Node) DispatchTask(ctx context.Context, worker types.Worker, task *odys
 			}).Error("dispatch to manager failed")
 			if strings.HasSuffix(err.Error(), "deadline exceeded") {
 				shouldAddBack = true
-				return ErrTimeout
+				return types.ErrTimeout
 			}
 			continue
 		}

types/worker.go

 package types
 
+import "errors"
+
+var (
+	ErrNoWorker = errors.New("no worker")
+	ErrTimeout  = errors.New("schedule timeout")
+)
+
 type Worker struct {
 	Workerid string
 	Addr     string

workerpoper/v1.go

@@ -53,7 +53,7 @@ func (p *poperV1) PopWorker(ctx context.Context, rdb *redis.Client, task *odysse
 	for i := 0; i < maxPriority; i++ {
 		for {
 			if ctx.Err() != nil {
-				return types.Worker{}, ErrTimeout
+				return types.Worker{}, types.ErrTimeout
 			}
 
 			elem, err := rdb.LPop(context.Background(), config.WORKER_QUEUE_PREFIX+strconv.Itoa(i)).Result()
@@ -100,7 +100,7 @@ func (p *poperV1) PopWorker(ctx context.Context, rdb *redis.Client, task *odysse
 			return worker, nil
 		}
 	}
-	return types.Worker{}, ErrNoWorker
+	return types.Worker{}, types.ErrNoWorker
 }
 
 func parseWorkerId(elem string) (string, int64) {

workerpoper/v2.go

@@ -46,7 +46,7 @@ func (p *poperV2) AddBack(w types.Worker) {
 func (p *poperV2) PopWorker(ctx context.Context, rdb *redis.Client, task *odysseus.TaskContent, ex map[string]bool) (types.Worker, error) {
 	// 1. select from running model worker.
 	if ctx.Err() != nil {
-		return types.Worker{}, ErrTimeout
+		return types.Worker{}, types.ErrTimeout
 	}
 	workers, err := p.workerRunningOperator.FindWorkerByModelId(ctx, int(task.TaskType), 10)
 	if err != nil {
@@ -123,5 +123,5 @@ func (p *poperV2) PopWorker(ctx context.Context, rdb *redis.Client, task *odysse
 
 		return worker, nil
 	}
-	return types.Worker{}, ErrNoWorker
+	return types.Worker{}, types.ErrNoWorker
 }

workerpoper/workerpoper.go

@@ -2,7 +2,6 @@ package workerpoper
 
 import (
 	"context"
-	"errors"
 	odysseus "github.com/odysseus/odysseus-protocol/gen/proto/go/base/v1"
 	"github.com/odysseus/scheduler/config"
 	"github.com/odysseus/scheduler/types"
@@ -10,11 +9,6 @@ import (
 	log "github.com/sirupsen/logrus"
 )
 
-var (
-	ErrNoWorker = errors.New("no worker")
-	ErrTimeout  = errors.New("schedule timeout")
-)
-
 type WorkerPoper interface {
 	CanAddBack() bool
 	AddBack(worker types.Worker)