Skip to content

Commit e9fdf71

Browse files
authored
feat: add manager client list scheduler interface (dragonflyoss#694)
* feat: add manager client list scheduler interface Signed-off-by: Gaius <[email protected]>
1 parent 7dbb9ee commit e9fdf71

File tree

2 files changed

+41
-7
lines changed

2 files changed

+41
-7
lines changed

pkg/rpc/manager/client/client.go

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,23 @@ const (
3939
)
4040

4141
type Client interface {
42-
Close() error
42+
// Get Scheduler and Scheduler cluster configuration
4343
GetScheduler(*manager.GetSchedulerRequest) (*manager.Scheduler, error)
44+
45+
// Update scheduler configuration
4446
UpdateScheduler(*manager.UpdateSchedulerRequest) (*manager.Scheduler, error)
47+
48+
// Update CDN configuration
4549
UpdateCDN(*manager.UpdateCDNRequest) (*manager.CDN, error)
50+
51+
// List acitve schedulers configuration
52+
ListSchedulers(*manager.ListSchedulersRequest) (*manager.ListSchedulersResponse, error)
53+
54+
// KeepAlive with manager
4655
KeepAlive(time.Duration, *manager.KeepAliveRequest)
56+
57+
// Close client connect
58+
Close() error
4759
}
4860

4961
type client struct {
@@ -79,25 +91,32 @@ func New(target string) (Client, error) {
7991
}, nil
8092
}
8193

82-
func (c *client) GetScheduler(scheduler *manager.GetSchedulerRequest) (*manager.Scheduler, error) {
94+
func (c *client) GetScheduler(req *manager.GetSchedulerRequest) (*manager.Scheduler, error) {
95+
ctx, cancel := context.WithTimeout(context.Background(), contextTimeout)
96+
defer cancel()
97+
98+
return c.ManagerClient.GetScheduler(ctx, req)
99+
}
100+
101+
func (c *client) UpdateScheduler(req *manager.UpdateSchedulerRequest) (*manager.Scheduler, error) {
83102
ctx, cancel := context.WithTimeout(context.Background(), contextTimeout)
84103
defer cancel()
85104

86-
return c.ManagerClient.GetScheduler(ctx, scheduler)
105+
return c.ManagerClient.UpdateScheduler(ctx, req)
87106
}
88107

89-
func (c *client) UpdateScheduler(scheduler *manager.UpdateSchedulerRequest) (*manager.Scheduler, error) {
108+
func (c *client) UpdateCDN(req *manager.UpdateCDNRequest) (*manager.CDN, error) {
90109
ctx, cancel := context.WithTimeout(context.Background(), contextTimeout)
91110
defer cancel()
92111

93-
return c.ManagerClient.UpdateScheduler(ctx, scheduler)
112+
return c.ManagerClient.UpdateCDN(ctx, req)
94113
}
95114

96-
func (c *client) UpdateCDN(cdn *manager.UpdateCDNRequest) (*manager.CDN, error) {
115+
func (c *client) ListSchedulers(req *manager.ListSchedulersRequest) (*manager.ListSchedulersResponse, error) {
97116
ctx, cancel := context.WithTimeout(context.Background(), contextTimeout)
98117
defer cancel()
99118

100-
return c.ManagerClient.UpdateCDN(ctx, cdn)
119+
return c.ManagerClient.ListSchedulers(ctx, req)
101120
}
102121

103122
func (c *client) KeepAlive(interval time.Duration, keepalive *manager.KeepAliveRequest) {

scheduler/config/mocks/manager_client_mock.go

Lines changed: 15 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)