From 65bf673d2d82d4ac4cdc0c7ded7c4911504e4e89 Mon Sep 17 00:00:00 2001 From: Gaius Date: Thu, 6 Apr 2023 18:12:50 +0800 Subject: [PATCH] fix: ip and hostname params in FindSchedulerClusters (#2249) Signed-off-by: Gaius --- manager/rpcserver/manager_server_v1.go | 2 +- manager/rpcserver/manager_server_v2.go | 2 +- scheduler/networktopology/mocks/probes_mock.go | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/manager/rpcserver/manager_server_v1.go b/manager/rpcserver/manager_server_v1.go index c54de8a28..2b1adaea8 100644 --- a/manager/rpcserver/manager_server_v1.go +++ b/manager/rpcserver/manager_server_v1.go @@ -525,7 +525,7 @@ func (s *managerServerV1) ListSchedulers(ctx context.Context, req *managerv1.Lis candidateSchedulerClusters []models.SchedulerCluster err error ) - candidateSchedulerClusters, err = s.searcher.FindSchedulerClusters(ctx, tmpSchedulerClusters, req.Hostname, req.Ip, req.HostInfo, logger.CoreLogger) + candidateSchedulerClusters, err = s.searcher.FindSchedulerClusters(ctx, tmpSchedulerClusters, req.Ip, req.Hostname, req.HostInfo, logger.CoreLogger) if err != nil { log.Error(err) metrics.SearchSchedulerClusterFailureCount.WithLabelValues(req.Version, req.Commit).Inc() diff --git a/manager/rpcserver/manager_server_v2.go b/manager/rpcserver/manager_server_v2.go index aa614b03c..57e9602e3 100644 --- a/manager/rpcserver/manager_server_v2.go +++ b/manager/rpcserver/manager_server_v2.go @@ -524,7 +524,7 @@ func (s *managerServerV2) ListSchedulers(ctx context.Context, req *managerv2.Lis candidateSchedulerClusters []models.SchedulerCluster err error ) - candidateSchedulerClusters, err = s.searcher.FindSchedulerClusters(ctx, tmpSchedulerClusters, req.Hostname, req.Ip, req.HostInfo, logger.CoreLogger) + candidateSchedulerClusters, err = s.searcher.FindSchedulerClusters(ctx, tmpSchedulerClusters, req.Ip, req.Hostname, req.HostInfo, logger.CoreLogger) if err != nil { log.Error(err) metrics.SearchSchedulerClusterFailureCount.WithLabelValues(req.Version, req.Commit).Inc() diff --git a/scheduler/networktopology/mocks/probes_mock.go b/scheduler/networktopology/mocks/probes_mock.go index 60f9aeac9..5192ee37d 100644 --- a/scheduler/networktopology/mocks/probes_mock.go +++ b/scheduler/networktopology/mocks/probes_mock.go @@ -50,6 +50,20 @@ func (mr *MockProbesMockRecorder) AverageRTT() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AverageRTT", reflect.TypeOf((*MockProbes)(nil).AverageRTT)) } +// CreatedAt mocks base method. +func (m *MockProbes) CreatedAt() time.Time { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreatedAt") + ret0, _ := ret[0].(time.Time) + return ret0 +} + +// CreatedAt indicates an expected call of CreatedAt. +func (mr *MockProbesMockRecorder) CreatedAt() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatedAt", reflect.TypeOf((*MockProbes)(nil).CreatedAt)) +} + // Dequeue mocks base method. func (m *MockProbes) Dequeue() (*networktopology.Probe, bool) { m.ctrl.T.Helper()