dragonflyoss
/
dragonfly
mirror of https://github.com/dragonflyoss/dragonfly.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: ip and hostname params in FindSchedulerClusters (#2249) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2023-04-06 18:12:50 +08:00
parent 81c647bd0f
commit 65bf673d2d
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
3 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manager/rpcserver/manager_server_v1.go
View File

@ -525,7 +525,7 @@ func (s *managerServerV1) ListSchedulers(ctx context.Context, req *managerv1.Lis
candidateSchedulerClusters []models.SchedulerCluster candidateSchedulerClusters []models.SchedulerCluster
err error 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 { if err != nil {
log.Error(err) log.Error(err)
metrics.SearchSchedulerClusterFailureCount.WithLabelValues(req.Version, req.Commit).Inc() metrics.SearchSchedulerClusterFailureCount.WithLabelValues(req.Version, req.Commit).Inc()

2
manager/rpcserver/manager_server_v2.go
View File

@ -524,7 +524,7 @@ func (s *managerServerV2) ListSchedulers(ctx context.Context, req *managerv2.Lis
candidateSchedulerClusters []models.SchedulerCluster candidateSchedulerClusters []models.SchedulerCluster
err error 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 { if err != nil {
log.Error(err) log.Error(err)
metrics.SearchSchedulerClusterFailureCount.WithLabelValues(req.Version, req.Commit).Inc() metrics.SearchSchedulerClusterFailureCount.WithLabelValues(req.Version, req.Commit).Inc()

14
scheduler/networktopology/mocks/probes_mock.go
View File

@ -50,6 +50,20 @@ func (mr *MockProbesMockRecorder) AverageRTT() *gomock.Call {
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AverageRTT", reflect.TypeOf((*MockProbes)(nil).AverageRTT)) 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. // Dequeue mocks base method.
func (m *MockProbes) Dequeue() (*networktopology.Probe, bool) { func (m *MockProbes) Dequeue() (*networktopology.Probe, bool) {
m.ctrl.T.Helper() m.ctrl.T.Helper()