From 5342fb97fc7dec72d3da4cebe4db2a41d9470eb1 Mon Sep 17 00:00:00 2001 From: Gaius Date: Thu, 15 Jun 2023 17:08:52 +0800 Subject: [PATCH] fix: Interval in SyncProbesResponse (#2466) Signed-off-by: Gaius --- pkg/dfpath/mocks/dfpath_mock.go | 43 ++++++++++++++++++++++++++++ scheduler/service/service_v1.go | 4 +-- scheduler/service/service_v1_test.go | 2 -- scheduler/service/service_v2.go | 3 +- scheduler/service/service_v2_test.go | 2 -- 5 files changed, 45 insertions(+), 9 deletions(-) diff --git a/pkg/dfpath/mocks/dfpath_mock.go b/pkg/dfpath/mocks/dfpath_mock.go index ceaafc4d8..dcee7bfa5 100644 --- a/pkg/dfpath/mocks/dfpath_mock.go +++ b/pkg/dfpath/mocks/dfpath_mock.go @@ -5,6 +5,7 @@ package mocks import ( + fs "io/fs" reflect "reflect" gomock "github.com/golang/mock/gomock" @@ -47,6 +48,20 @@ func (mr *MockDfpathMockRecorder) CacheDir() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CacheDir", reflect.TypeOf((*MockDfpath)(nil).CacheDir)) } +// CacheDirMode mocks base method. +func (m *MockDfpath) CacheDirMode() fs.FileMode { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CacheDirMode") + ret0, _ := ret[0].(fs.FileMode) + return ret0 +} + +// CacheDirMode indicates an expected call of CacheDirMode. +func (mr *MockDfpathMockRecorder) CacheDirMode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CacheDirMode", reflect.TypeOf((*MockDfpath)(nil).CacheDirMode)) +} + // DaemonLockPath mocks base method. func (m *MockDfpath) DaemonLockPath() string { m.ctrl.T.Helper() @@ -89,6 +104,20 @@ func (mr *MockDfpathMockRecorder) DataDir() *gomock.Call { return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DataDir", reflect.TypeOf((*MockDfpath)(nil).DataDir)) } +// DataDirMode mocks base method. +func (m *MockDfpath) DataDirMode() fs.FileMode { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DataDirMode") + ret0, _ := ret[0].(fs.FileMode) + return ret0 +} + +// DataDirMode indicates an expected call of DataDirMode. +func (mr *MockDfpathMockRecorder) DataDirMode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DataDirMode", reflect.TypeOf((*MockDfpath)(nil).DataDirMode)) +} + // DfgetLockPath mocks base method. func (m *MockDfpath) DfgetLockPath() string { m.ctrl.T.Helper() @@ -144,3 +173,17 @@ func (mr *MockDfpathMockRecorder) WorkHome() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WorkHome", reflect.TypeOf((*MockDfpath)(nil).WorkHome)) } + +// WorkHomeMode mocks base method. +func (m *MockDfpath) WorkHomeMode() fs.FileMode { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "WorkHomeMode") + ret0, _ := ret[0].(fs.FileMode) + return ret0 +} + +// WorkHomeMode indicates an expected call of WorkHomeMode. +func (mr *MockDfpathMockRecorder) WorkHomeMode() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "WorkHomeMode", reflect.TypeOf((*MockDfpath)(nil).WorkHomeMode)) +} diff --git a/scheduler/service/service_v1.go b/scheduler/service/service_v1.go index 2c6048ed1..29b6b14f5 100644 --- a/scheduler/service/service_v1.go +++ b/scheduler/service/service_v1.go @@ -28,7 +28,6 @@ import ( "go.opentelemetry.io/otel/trace" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" - "google.golang.org/protobuf/types/known/durationpb" commonv1 "d7y.io/api/pkg/apis/common/v1" commonv2 "d7y.io/api/pkg/apis/common/v2" @@ -710,8 +709,7 @@ func (v *V1) SyncProbes(stream schedulerv1.Scheduler_SyncProbesServer) error { logger.Infof("probe started: %#v", probedHosts) if err := stream.Send(&schedulerv1.SyncProbesResponse{ - Hosts: probedHosts, - ProbeInterval: durationpb.New(v.config.NetworkTopology.Probe.Interval), + Hosts: probedHosts, }); err != nil { logger.Error(err) return err diff --git a/scheduler/service/service_v1_test.go b/scheduler/service/service_v1_test.go index 9a3d39459..da79afb74 100644 --- a/scheduler/service/service_v1_test.go +++ b/scheduler/service/service_v1_test.go @@ -2715,7 +2715,6 @@ func TestServiceV1_SyncProbes(t *testing.T) { Idc: mockRawHost.Network.IDC, }, }, - ProbeInterval: durationpb.New(mockNetworkTopologyConfig.Probe.Interval), })).Return(nil).Times(1), ms.Recv().Return(nil, io.EOF).Times(1), ) @@ -2947,7 +2946,6 @@ func TestServiceV1_SyncProbes(t *testing.T) { Idc: mockRawHost.Network.IDC, }, }, - ProbeInterval: durationpb.New(mockNetworkTopologyConfig.Probe.Interval), })).Return(errors.New("send synchronize probes response error")).Times(1), ) }, diff --git a/scheduler/service/service_v2.go b/scheduler/service/service_v2.go index c0ef795ee..282c6bcd2 100644 --- a/scheduler/service/service_v2.go +++ b/scheduler/service/service_v2.go @@ -750,8 +750,7 @@ func (v *V2) SyncProbes(stream schedulerv2.Scheduler_SyncProbesServer) error { logger.Infof("probe started: %#v", probedHosts) if err := stream.Send(&schedulerv2.SyncProbesResponse{ - Hosts: probedHosts, - ProbeInterval: durationpb.New(v.config.NetworkTopology.Probe.Interval), + Hosts: probedHosts, }); err != nil { logger.Error(err) return err diff --git a/scheduler/service/service_v2_test.go b/scheduler/service/service_v2_test.go index 1f9dd3133..6fe4d3cb0 100644 --- a/scheduler/service/service_v2_test.go +++ b/scheduler/service/service_v2_test.go @@ -996,7 +996,6 @@ func TestServiceV2_SyncProbes(t *testing.T) { Build: mockV2Probe.Host.Build, }, }, - ProbeInterval: durationpb.New(mockNetworkTopologyConfig.Probe.Interval), })).Return(nil).Times(1), ms.Recv().Return(nil, io.EOF).Times(1), ) @@ -1300,7 +1299,6 @@ func TestServiceV2_SyncProbes(t *testing.T) { Build: mockV2Probe.Host.Build, }, }, - ProbeInterval: durationpb.New(mockNetworkTopologyConfig.Probe.Interval), })).Return(errors.New("send synchronize probes response error")).Times(1), ) },