feat: scheduler addresses log (#1183)

Signed-off-by: Gaius <[email protected]>
dragonflyoss · Jun 28, 2023 · 04bd2ea · 04bd2ea
1 parent 738e5ed
commit 04bd2ea
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 10 deletions.
diff --git a/client/daemon/daemon.go b/client/daemon/daemon.go
@@ -564,7 +564,8 @@ func (cd *clientDaemon) Stop() {
 func (cd *clientDaemon) OnNotify(data *config.DynconfigData) {
 	ips := getSchedulerIPs(data.Schedulers)
 	if reflect.DeepEqual(cd.schedulers, data.Schedulers) {
-		logger.Infof("scheduler addresses deep equal: %v", ips)
+		logger.Infof("scheduler addresses deep equal: %v, used: %#v",
+			ips, cd.schedulerClient.GetState())
 		return
 	}
 
@@ -575,7 +576,7 @@ func (cd *clientDaemon) OnNotify(data *config.DynconfigData) {
 	cd.schedulerClient.UpdateState(addrs)
 	cd.schedulers = data.Schedulers
 
-	logger.Infof("scheduler addresses have been updated: %v", ips)
+	logger.Infof("scheduler addresses have been updated: %#v", addrs)
 }
 
 // getSchedulerIPs get ips by schedulers.

diff --git a/client/daemon/peer/peertask_dummy.go b/client/daemon/peer/peertask_dummy.go
@@ -55,6 +55,10 @@ func (d *dummySchedulerClient) Close() error {
 func (d *dummySchedulerClient) UpdateState(addrs []dfnet.NetAddr) {
 }
 
+func (d *dummySchedulerClient) GetState() []dfnet.NetAddr {
+	return nil
+}
+
 type dummyPeerPacketStream struct {
 }
 

diff --git a/client/daemon/peer/peertask_manager_mock_test.go b/client/daemon/peer/peertask_manager_mock_test.go
diff --git a/client/daemon/test/mock/scheduler/scheduler_client.go b/client/daemon/test/mock/scheduler/scheduler_client.go
diff --git a/pkg/rpc/client.go b/pkg/rpc/client.go
@@ -440,3 +440,7 @@ func (conn *Connection) UpdateState(addrs []dfnet.NetAddr) {
 
 	logger.GrpcLogger.Infof("update grpc client addresses %v", addresses)
 }
+
+func (conn *Connection) GetState() []dfnet.NetAddr {
+	return conn.serverNodes
+}
diff --git a/pkg/rpc/scheduler/client/client.go b/pkg/rpc/scheduler/client/client.go
@@ -58,7 +58,9 @@ type SchedulerClient interface {
 
 	LeaveTask(context.Context, *scheduler.PeerTarget, ...grpc.CallOption) error
 
-	UpdateState(addrs []dfnet.NetAddr)
+	UpdateState([]dfnet.NetAddr)
+
+	GetState() []dfnet.NetAddr
 
 	Close() error
 }
@@ -239,5 +241,3 @@ func (sc *schedulerClient) LeaveTask(ctx context.Context, pt *scheduler.PeerTarg
 	}
 	return
 }
-
-var _ SchedulerClient = (*schedulerClient)(nil)
diff --git a/pkg/rpc/scheduler/client/mocks/client_mock.go b/pkg/rpc/scheduler/client/mocks/client_mock.go