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

feat: remove SyncNetworkTopology API (#2296) 

Signed-off-by: Gaius <gaius.qi@gmail.com>
This commit is contained in:
Gaius 2023-04-24 19:55:44 +08:00
parent e403e62551
commit e9cb38e851
No known key found for this signature in database
GPG Key ID: 8B4E5D1290FA2FFB
9 changed files with 9 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/daemon/peer/peertask_dummy.go
View File

@ -68,10 +68,6 @@ func (d *dummySchedulerClient) SyncProbes(ctx context.Context, req *schedulerv1.
panic("should not call this function")
}
func (d *dummySchedulerClient) SyncNetworkTopology(ctx context.Context, req *schedulerv1.SyncNetworkTopologyRequest, opts ...grpc.CallOption) (schedulerv1.Scheduler_SyncNetworkTopologyClient, error) {
panic("should not call this function")
}
func (d *dummySchedulerClient) Close() error {
return nil
}

6
go.mod
View File

@ -3,7 +3,7 @@ module d7y.io/dragonfly/v2
go 1.20
require (
d7y.io/api v1.8.8
d7y.io/api v1.8.9
github.com/RichardKnop/machinery v1.10.6
github.com/Showmax/go-fqdn v1.0.0
github.com/VividCortex/mysqlerr v1.0.0
@ -78,7 +78,7 @@ require (
golang.org/x/sys v0.6.0
golang.org/x/time v0.3.0
google.golang.org/api v0.114.0
google.golang.org/grpc v1.55.0-dev
google.golang.org/grpc v1.56.0-dev
google.golang.org/protobuf v1.30.0
gopkg.in/natefinch/lumberjack.v2 v2.0.0
gopkg.in/yaml.v3 v3.0.1
@ -129,7 +129,7 @@ require (
github.com/golang-jwt/jwt/v4 v4.4.3 // indirect
github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect
github.com/golang-sql/sqlexp v0.1.0 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/go-querystring v1.1.0 // indirect

11
go.sum
View File

@ -51,8 +51,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo=
d7y.io/api v1.8.8 h1:4JxGj+uvrqAYB3o8odxbcA6PySxuR4D6oOgAwqbq0HY=
d7y.io/api v1.8.8/go.mod h1:HIJMfhqiBHJ0yNVuOASQe6X0IVzOkxdLiWzcMM0xo2c=
d7y.io/api v1.8.9 h1:t0LC6zVprbldWkk+FeiuAgj1o5OAwLryVc4fv2hihEA=
d7y.io/api v1.8.9/go.mod h1:OfAJccJrXY8G0QxSso79Hyg0NaPJmSEKJdi5p2Sowbo=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20201218220906-28db891af037/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.0.0/go.mod h1:uGG2W01BaETf0Ozp+QxxKJdMBNRWPdstHG0Fmdwn1/U=
@ -428,8 +428,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD
github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
github.com/golang/snappy v0.0.2/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
@ -1651,8 +1652,8 @@ google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA5
google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34=
google.golang.org/grpc v1.55.0-dev h1:b3WG8LoyS+X/C5ZbIWsJGjt8Hhqq0wUVX8+rPF/BHZo=
google.golang.org/grpc v1.55.0-dev/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g=
google.golang.org/grpc v1.56.0-dev h1:3XdSkn+E4E0OxKEID50paHDwVA7cqZVolkHtMFaoQJA=
google.golang.org/grpc v1.56.0-dev/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGONTY8=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=

14
pkg/rpc/scheduler/client/client_v1.go
View File

@ -151,9 +151,6 @@ type V1 interface {
// SyncProbes sync probes of the host.
SyncProbes(context.Context, *schedulerv1.SyncProbesRequest, ...grpc.CallOption) (schedulerv1.Scheduler_SyncProbesClient, error)
// SyncNetworkTopology sync network topology of the hosts.
SyncNetworkTopology(context.Context, *schedulerv1.SyncNetworkTopologyRequest, ...grpc.CallOption) (schedulerv1.Scheduler_SyncNetworkTopologyClient, error)
// Close tears down the ClientConn and all underlying connections.
Close() error
}
@ -319,14 +316,3 @@ func (v *v1) SyncProbes(ctx context.Context, req *schedulerv1.SyncProbesRequest,
// Send begin of piece.
return stream, stream.Send(req)
}
// SyncNetworkTopology sync network topology of the hosts.
func (v *v1) SyncNetworkTopology(ctx context.Context, req *schedulerv1.SyncNetworkTopologyRequest, opts ...grpc.CallOption) (schedulerv1.Scheduler_SyncNetworkTopologyClient, error) {
stream, err := v.SchedulerClient.SyncNetworkTopology(ctx, opts...)
if err != nil {
return nil, err
}
// Send begin of piece.
return stream, stream.Send(req)
}

14
pkg/rpc/scheduler/client/client_v2.go
View File

@ -144,9 +144,6 @@ type V2 interface {
// SyncProbes sync probes of the host.
SyncProbes(context.Context, *schedulerv2.SyncProbesRequest, ...grpc.CallOption) (schedulerv2.Scheduler_SyncProbesClient, error)
// SyncNetworkTopology sync network topology of the hosts.
SyncNetworkTopology(context.Context, *schedulerv2.SyncNetworkTopologyRequest, ...grpc.CallOption) (schedulerv2.Scheduler_SyncNetworkTopologyClient, error)
// Close tears down the ClientConn and all underlying connections.
Close() error
}
@ -288,14 +285,3 @@ func (v *v2) SyncProbes(ctx context.Context, req *schedulerv2.SyncProbesRequest,
// Send begin of piece.
return stream, stream.Send(req)
}
// SyncNetworkTopology sync network topology of the hosts.
func (v *v2) SyncNetworkTopology(ctx context.Context, req *schedulerv2.SyncNetworkTopologyRequest, opts ...grpc.CallOption) (schedulerv2.Scheduler_SyncNetworkTopologyClient, error) {
stream, err := v.SchedulerClient.SyncNetworkTopology(ctx, opts...)
if err != nil {
return nil, err
}
// Send begin of piece.
return stream, stream.Send(req)
}

20
pkg/rpc/scheduler/client/mocks/client_v1_mock.go
View File

@ -205,26 +205,6 @@ func (mr *MockV1MockRecorder) StatTask(arg0, arg1 interface{}, arg2 ...interface
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StatTask", reflect.TypeOf((*MockV1)(nil).StatTask), varargs...)
}
// SyncNetworkTopology mocks base method.
func (m *MockV1) SyncNetworkTopology(arg0 context.Context, arg1 *scheduler.SyncNetworkTopologyRequest, arg2 ...grpc.CallOption) (scheduler.Scheduler_SyncNetworkTopologyClient, error) {
m.ctrl.T.Helper()
varargs := []interface{}{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "SyncNetworkTopology", varargs...)
ret0, _ := ret[0].(scheduler.Scheduler_SyncNetworkTopologyClient)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// SyncNetworkTopology indicates an expected call of SyncNetworkTopology.
func (mr *MockV1MockRecorder) SyncNetworkTopology(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]interface{}{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncNetworkTopology", reflect.TypeOf((*MockV1)(nil).SyncNetworkTopology), varargs...)
}
// SyncProbes mocks base method.
func (m *MockV1) SyncProbes(arg0 context.Context, arg1 *scheduler.SyncProbesRequest, arg2 ...grpc.CallOption) (scheduler.Scheduler_SyncProbesClient, error) {
m.ctrl.T.Helper()

20
pkg/rpc/scheduler/client/mocks/client_v2_mock.go
View File

@ -188,26 +188,6 @@ func (mr *MockV2MockRecorder) StatTask(arg0, arg1 interface{}, arg2 ...interface
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "StatTask", reflect.TypeOf((*MockV2)(nil).StatTask), varargs...)
}
// SyncNetworkTopology mocks base method.
func (m *MockV2) SyncNetworkTopology(arg0 context.Context, arg1 *scheduler.SyncNetworkTopologyRequest, arg2 ...grpc.CallOption) (scheduler.Scheduler_SyncNetworkTopologyClient, error) {
m.ctrl.T.Helper()
varargs := []interface{}{arg0, arg1}
for _, a := range arg2 {
varargs = append(varargs, a)
}
ret := m.ctrl.Call(m, "SyncNetworkTopology", varargs...)
ret0, _ := ret[0].(scheduler.Scheduler_SyncNetworkTopologyClient)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// SyncNetworkTopology indicates an expected call of SyncNetworkTopology.
func (mr *MockV2MockRecorder) SyncNetworkTopology(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
varargs := append([]interface{}{arg0, arg1}, arg2...)
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SyncNetworkTopology", reflect.TypeOf((*MockV2)(nil).SyncNetworkTopology), varargs...)
}
// SyncProbes mocks base method.
func (m *MockV2) SyncProbes(arg0 context.Context, arg1 *scheduler.SyncProbesRequest, arg2 ...grpc.CallOption) (scheduler.Scheduler_SyncProbesClient, error) {
m.ctrl.T.Helper()

6
scheduler/rpcserver/scheduler_server_v1.go
View File

@ -162,9 +162,3 @@ func (s *schedulerServerV1) LeaveHost(ctx context.Context, req *schedulerv1.Leav
func (s *schedulerServerV1) SyncProbes(stream schedulerv1.Scheduler_SyncProbesServer) error {
return nil
}
// TODO Implement SyncProbes
// SyncNetworkTopology sync network topology of the hosts.
func (s *schedulerServerV1) SyncNetworkTopology(stream schedulerv1.Scheduler_SyncNetworkTopologyServer) error {
return nil
}

5
scheduler/rpcserver/scheduler_server_v2.go
View File

@ -154,8 +154,3 @@ func (s *schedulerServerV2) LeaveHost(ctx context.Context, req *schedulerv2.Leav
func (s *schedulerServerV2) SyncProbes(stream schedulerv2.Scheduler_SyncProbesServer) error {
return nil
}
// SyncNetworkTopology sync network topology of the hosts.
func (s *schedulerServerV2) SyncNetworkTopology(stream schedulerv2.Scheduler_SyncNetworkTopologyServer) error {
return nil
}