Skip to content

Commit de30f0a

Browse files
authored
feat: add context for FindSchedulerCluster (#841)
Signed-off-by: Gaius <[email protected]>
1 parent 956b4fb commit de30f0a

File tree

5 files changed

+11
-6
lines changed

5 files changed

+11
-6
lines changed

manager/searcher/searcher.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package searcher
1818

1919
import (
20+
"context"
2021
"strings"
2122

2223
"github.com/mitchellh/mapstructure"
@@ -72,7 +73,7 @@ type Scopes struct {
7273
}
7374

7475
type Searcher interface {
75-
FindSchedulerCluster([]model.SchedulerCluster, *manager.ListSchedulersRequest) (model.SchedulerCluster, bool)
76+
FindSchedulerCluster(context.Context, []model.SchedulerCluster, *manager.ListSchedulersRequest) (model.SchedulerCluster, bool)
7677
}
7778

7879
type searcher struct{}
@@ -86,7 +87,7 @@ func New() Searcher {
8687
return s
8788
}
8889

89-
func (s *searcher) FindSchedulerCluster(schedulerClusters []model.SchedulerCluster, client *manager.ListSchedulersRequest) (model.SchedulerCluster, bool) {
90+
func (s *searcher) FindSchedulerCluster(ctx context.Context, schedulerClusters []model.SchedulerCluster, client *manager.ListSchedulersRequest) (model.SchedulerCluster, bool) {
9091
conditions := client.HostInfo
9192
if len(schedulerClusters) <= 0 || len(conditions) <= 0 {
9293
return model.SchedulerCluster{}, false

manager/searcher/searcher_test.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package searcher
1818

1919
import (
20+
"context"
2021
"testing"
2122

2223
"github.com/stretchr/testify/assert"
@@ -345,7 +346,7 @@ func TestSchedulerCluster(t *testing.T) {
345346
for _, tc := range tests {
346347
t.Run(tc.name, func(t *testing.T) {
347348
searcher := New()
348-
clusters, ok := searcher.FindSchedulerCluster(tc.schedulerClusters, &manager.ListSchedulersRequest{
349+
clusters, ok := searcher.FindSchedulerCluster(context.Background(), tc.schedulerClusters, &manager.ListSchedulersRequest{
349350
HostName: "foo",
350351
Ip: "127.0.0.1",
351352
HostInfo: tc.conditions,

manager/searcher/testdata/main.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package main
1818

1919
import (
20+
"context"
2021
"flag"
2122
"fmt"
2223
"os"
@@ -40,7 +41,7 @@ func main() {
4041
os.Exit(1)
4142
}
4243

43-
cluster, ok := s.FindSchedulerCluster([]model.SchedulerCluster{}, &manager.ListSchedulersRequest{})
44+
cluster, ok := s.FindSchedulerCluster(context.Background(), []model.SchedulerCluster{}, &manager.ListSchedulersRequest{})
4445
if !ok {
4546
fmt.Println("scheduler cluster not found")
4647
os.Exit(1)

manager/searcher/testdata/plugin/searcher.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,15 @@
1717
package main
1818

1919
import (
20+
"context"
21+
2022
"d7y.io/dragonfly/v2/manager/model"
2123
"d7y.io/dragonfly/v2/pkg/rpc/manager"
2224
)
2325

2426
type searcher struct{}
2527

26-
func (s *searcher) FindSchedulerCluster(schedulerClusters []model.SchedulerCluster, client *manager.ListSchedulersRequest) (model.SchedulerCluster, bool) {
28+
func (s *searcher) FindSchedulerCluster(ctx context.Context, schedulerClusters []model.SchedulerCluster, client *manager.ListSchedulersRequest) (model.SchedulerCluster, bool) {
2729
return model.SchedulerCluster{Name: "foo"}, true
2830
}
2931

manager/service/service_grpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ func (s *GRPC) ListSchedulers(ctx context.Context, req *manager.ListSchedulersRe
382382
}
383383

384384
// Search optimal scheduler cluster
385-
schedulerCluster, ok := s.searcher.FindSchedulerCluster(schedulerClusters, req)
385+
schedulerCluster, ok := s.searcher.FindSchedulerCluster(ctx, schedulerClusters, req)
386386
if !ok {
387387
return nil, status.Error(codes.NotFound, "scheduler cluster not found")
388388
}

0 commit comments

Comments
 (0)