diff --git a/Cargo.lock b/Cargo.lock index 6d41cba..10f6c95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -160,7 +160,7 @@ dependencies = [ [[package]] name = "dragonfly-api" -version = "2.0.125" +version = "2.0.126" dependencies = [ "prost 0.11.9", "prost-types 0.12.6", diff --git a/Cargo.toml b/Cargo.toml index 873fc92..e34c172 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "dragonfly-api" -version = "2.0.125" +version = "2.0.126" authors = ["Gaius "] edition = "2021" license = "Apache-2.0" diff --git a/pkg/apis/scheduler/v2/scheduler.pb.go b/pkg/apis/scheduler/v2/scheduler.pb.go index 9fb8c4e..b48856e 100644 --- a/pkg/apis/scheduler/v2/scheduler.pb.go +++ b/pkg/apis/scheduler/v2/scheduler.pb.go @@ -15,8 +15,8 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.34.1 -// protoc v5.27.0 +// protoc-gen-go v1.28.1 +// protoc v3.21.6 // source: pkg/apis/scheduler/v2/scheduler.proto package scheduler diff --git a/pkg/apis/scheduler/v2/scheduler_grpc.pb.go b/pkg/apis/scheduler/v2/scheduler_grpc.pb.go index e77e43d..70a8df0 100644 --- a/pkg/apis/scheduler/v2/scheduler_grpc.pb.go +++ b/pkg/apis/scheduler/v2/scheduler_grpc.pb.go @@ -1,22 +1,7 @@ -// -// Copyright 2022 The Dragonfly Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - // Code generated by protoc-gen-go-grpc. DO NOT EDIT. // versions: -// - protoc-gen-go-grpc v1.4.0 -// - protoc v5.27.0 +// - protoc-gen-go-grpc v1.2.0 +// - protoc v3.21.6 // source: pkg/apis/scheduler/v2/scheduler.proto package scheduler @@ -32,31 +17,12 @@ import ( // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -// Requires gRPC-Go v1.62.0 or later. -const _ = grpc.SupportPackageIsVersion8 - -const ( - Scheduler_AnnouncePeer_FullMethodName = "/scheduler.v2.Scheduler/AnnouncePeer" - Scheduler_StatPeer_FullMethodName = "/scheduler.v2.Scheduler/StatPeer" - Scheduler_DeletePeer_FullMethodName = "/scheduler.v2.Scheduler/DeletePeer" - Scheduler_StatTask_FullMethodName = "/scheduler.v2.Scheduler/StatTask" - Scheduler_DeleteTask_FullMethodName = "/scheduler.v2.Scheduler/DeleteTask" - Scheduler_AnnounceHost_FullMethodName = "/scheduler.v2.Scheduler/AnnounceHost" - Scheduler_DeleteHost_FullMethodName = "/scheduler.v2.Scheduler/DeleteHost" - Scheduler_SyncProbes_FullMethodName = "/scheduler.v2.Scheduler/SyncProbes" - Scheduler_AnnounceCachePeer_FullMethodName = "/scheduler.v2.Scheduler/AnnounceCachePeer" - Scheduler_StatCachePeer_FullMethodName = "/scheduler.v2.Scheduler/StatCachePeer" - Scheduler_DeleteCachePeer_FullMethodName = "/scheduler.v2.Scheduler/DeleteCachePeer" - Scheduler_UploadCacheTask_FullMethodName = "/scheduler.v2.Scheduler/UploadCacheTask" - Scheduler_StatCacheTask_FullMethodName = "/scheduler.v2.Scheduler/StatCacheTask" - Scheduler_DeleteCacheTask_FullMethodName = "/scheduler.v2.Scheduler/DeleteCacheTask" -) +// Requires gRPC-Go v1.32.0 or later. +const _ = grpc.SupportPackageIsVersion7 // SchedulerClient is the client API for Scheduler service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. -// -// Scheduler RPC Service. type SchedulerClient interface { // AnnouncePeer announces peer to scheduler. AnnouncePeer(ctx context.Context, opts ...grpc.CallOption) (Scheduler_AnnouncePeerClient, error) @@ -97,12 +63,11 @@ func NewSchedulerClient(cc grpc.ClientConnInterface) SchedulerClient { } func (c *schedulerClient) AnnouncePeer(ctx context.Context, opts ...grpc.CallOption) (Scheduler_AnnouncePeerClient, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - stream, err := c.cc.NewStream(ctx, &Scheduler_ServiceDesc.Streams[0], Scheduler_AnnouncePeer_FullMethodName, cOpts...) + stream, err := c.cc.NewStream(ctx, &Scheduler_ServiceDesc.Streams[0], "/scheduler.v2.Scheduler/AnnouncePeer", opts...) if err != nil { return nil, err } - x := &schedulerAnnouncePeerClient{ClientStream: stream} + x := &schedulerAnnouncePeerClient{stream} return x, nil } @@ -129,9 +94,8 @@ func (x *schedulerAnnouncePeerClient) Recv() (*AnnouncePeerResponse, error) { } func (c *schedulerClient) StatPeer(ctx context.Context, in *StatPeerRequest, opts ...grpc.CallOption) (*v2.Peer, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(v2.Peer) - err := c.cc.Invoke(ctx, Scheduler_StatPeer_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/StatPeer", in, out, opts...) if err != nil { return nil, err } @@ -139,9 +103,8 @@ func (c *schedulerClient) StatPeer(ctx context.Context, in *StatPeerRequest, opt } func (c *schedulerClient) DeletePeer(ctx context.Context, in *DeletePeerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Scheduler_DeletePeer_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/DeletePeer", in, out, opts...) if err != nil { return nil, err } @@ -149,9 +112,8 @@ func (c *schedulerClient) DeletePeer(ctx context.Context, in *DeletePeerRequest, } func (c *schedulerClient) StatTask(ctx context.Context, in *StatTaskRequest, opts ...grpc.CallOption) (*v2.Task, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(v2.Task) - err := c.cc.Invoke(ctx, Scheduler_StatTask_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/StatTask", in, out, opts...) if err != nil { return nil, err } @@ -159,9 +121,8 @@ func (c *schedulerClient) StatTask(ctx context.Context, in *StatTaskRequest, opt } func (c *schedulerClient) DeleteTask(ctx context.Context, in *DeleteTaskRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Scheduler_DeleteTask_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/DeleteTask", in, out, opts...) if err != nil { return nil, err } @@ -169,9 +130,8 @@ func (c *schedulerClient) DeleteTask(ctx context.Context, in *DeleteTaskRequest, } func (c *schedulerClient) AnnounceHost(ctx context.Context, in *AnnounceHostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Scheduler_AnnounceHost_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/AnnounceHost", in, out, opts...) if err != nil { return nil, err } @@ -179,9 +139,8 @@ func (c *schedulerClient) AnnounceHost(ctx context.Context, in *AnnounceHostRequ } func (c *schedulerClient) DeleteHost(ctx context.Context, in *DeleteHostRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Scheduler_DeleteHost_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/DeleteHost", in, out, opts...) if err != nil { return nil, err } @@ -189,12 +148,11 @@ func (c *schedulerClient) DeleteHost(ctx context.Context, in *DeleteHostRequest, } func (c *schedulerClient) SyncProbes(ctx context.Context, opts ...grpc.CallOption) (Scheduler_SyncProbesClient, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - stream, err := c.cc.NewStream(ctx, &Scheduler_ServiceDesc.Streams[1], Scheduler_SyncProbes_FullMethodName, cOpts...) + stream, err := c.cc.NewStream(ctx, &Scheduler_ServiceDesc.Streams[1], "/scheduler.v2.Scheduler/SyncProbes", opts...) if err != nil { return nil, err } - x := &schedulerSyncProbesClient{ClientStream: stream} + x := &schedulerSyncProbesClient{stream} return x, nil } @@ -221,12 +179,11 @@ func (x *schedulerSyncProbesClient) Recv() (*SyncProbesResponse, error) { } func (c *schedulerClient) AnnounceCachePeer(ctx context.Context, opts ...grpc.CallOption) (Scheduler_AnnounceCachePeerClient, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) - stream, err := c.cc.NewStream(ctx, &Scheduler_ServiceDesc.Streams[2], Scheduler_AnnounceCachePeer_FullMethodName, cOpts...) + stream, err := c.cc.NewStream(ctx, &Scheduler_ServiceDesc.Streams[2], "/scheduler.v2.Scheduler/AnnounceCachePeer", opts...) if err != nil { return nil, err } - x := &schedulerAnnounceCachePeerClient{ClientStream: stream} + x := &schedulerAnnounceCachePeerClient{stream} return x, nil } @@ -253,9 +210,8 @@ func (x *schedulerAnnounceCachePeerClient) Recv() (*AnnounceCachePeerResponse, e } func (c *schedulerClient) StatCachePeer(ctx context.Context, in *StatCachePeerRequest, opts ...grpc.CallOption) (*v2.CachePeer, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(v2.CachePeer) - err := c.cc.Invoke(ctx, Scheduler_StatCachePeer_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/StatCachePeer", in, out, opts...) if err != nil { return nil, err } @@ -263,9 +219,8 @@ func (c *schedulerClient) StatCachePeer(ctx context.Context, in *StatCachePeerRe } func (c *schedulerClient) DeleteCachePeer(ctx context.Context, in *DeleteCachePeerRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Scheduler_DeleteCachePeer_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/DeleteCachePeer", in, out, opts...) if err != nil { return nil, err } @@ -273,9 +228,8 @@ func (c *schedulerClient) DeleteCachePeer(ctx context.Context, in *DeleteCachePe } func (c *schedulerClient) UploadCacheTask(ctx context.Context, in *UploadCacheTaskRequest, opts ...grpc.CallOption) (*v2.CacheTask, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(v2.CacheTask) - err := c.cc.Invoke(ctx, Scheduler_UploadCacheTask_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/UploadCacheTask", in, out, opts...) if err != nil { return nil, err } @@ -283,9 +237,8 @@ func (c *schedulerClient) UploadCacheTask(ctx context.Context, in *UploadCacheTa } func (c *schedulerClient) StatCacheTask(ctx context.Context, in *StatCacheTaskRequest, opts ...grpc.CallOption) (*v2.CacheTask, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(v2.CacheTask) - err := c.cc.Invoke(ctx, Scheduler_StatCacheTask_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/StatCacheTask", in, out, opts...) if err != nil { return nil, err } @@ -293,9 +246,8 @@ func (c *schedulerClient) StatCacheTask(ctx context.Context, in *StatCacheTaskRe } func (c *schedulerClient) DeleteCacheTask(ctx context.Context, in *DeleteCacheTaskRequest, opts ...grpc.CallOption) (*emptypb.Empty, error) { - cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...) out := new(emptypb.Empty) - err := c.cc.Invoke(ctx, Scheduler_DeleteCacheTask_FullMethodName, in, out, cOpts...) + err := c.cc.Invoke(ctx, "/scheduler.v2.Scheduler/DeleteCacheTask", in, out, opts...) if err != nil { return nil, err } @@ -303,10 +255,8 @@ func (c *schedulerClient) DeleteCacheTask(ctx context.Context, in *DeleteCacheTa } // SchedulerServer is the server API for Scheduler service. -// All implementations must embed UnimplementedSchedulerServer +// All implementations should embed UnimplementedSchedulerServer // for forward compatibility -// -// Scheduler RPC Service. type SchedulerServer interface { // AnnouncePeer announces peer to scheduler. AnnouncePeer(Scheduler_AnnouncePeerServer) error @@ -336,10 +286,9 @@ type SchedulerServer interface { StatCacheTask(context.Context, *StatCacheTaskRequest) (*v2.CacheTask, error) // DeleteCacheTask releases cache task in scheduler. DeleteCacheTask(context.Context, *DeleteCacheTaskRequest) (*emptypb.Empty, error) - mustEmbedUnimplementedSchedulerServer() } -// UnimplementedSchedulerServer must be embedded to have forward compatible implementations. +// UnimplementedSchedulerServer should be embedded to have forward compatible implementations. type UnimplementedSchedulerServer struct { } @@ -385,7 +334,6 @@ func (UnimplementedSchedulerServer) StatCacheTask(context.Context, *StatCacheTas func (UnimplementedSchedulerServer) DeleteCacheTask(context.Context, *DeleteCacheTaskRequest) (*emptypb.Empty, error) { return nil, status.Errorf(codes.Unimplemented, "method DeleteCacheTask not implemented") } -func (UnimplementedSchedulerServer) mustEmbedUnimplementedSchedulerServer() {} // UnsafeSchedulerServer may be embedded to opt out of forward compatibility for this service. // Use of this interface is not recommended, as added methods to SchedulerServer will @@ -399,7 +347,7 @@ func RegisterSchedulerServer(s grpc.ServiceRegistrar, srv SchedulerServer) { } func _Scheduler_AnnouncePeer_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(SchedulerServer).AnnouncePeer(&schedulerAnnouncePeerServer{ServerStream: stream}) + return srv.(SchedulerServer).AnnouncePeer(&schedulerAnnouncePeerServer{stream}) } type Scheduler_AnnouncePeerServer interface { @@ -434,7 +382,7 @@ func _Scheduler_StatPeer_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_StatPeer_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/StatPeer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).StatPeer(ctx, req.(*StatPeerRequest)) @@ -452,7 +400,7 @@ func _Scheduler_DeletePeer_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_DeletePeer_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/DeletePeer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).DeletePeer(ctx, req.(*DeletePeerRequest)) @@ -470,7 +418,7 @@ func _Scheduler_StatTask_Handler(srv interface{}, ctx context.Context, dec func( } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_StatTask_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/StatTask", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).StatTask(ctx, req.(*StatTaskRequest)) @@ -488,7 +436,7 @@ func _Scheduler_DeleteTask_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_DeleteTask_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/DeleteTask", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).DeleteTask(ctx, req.(*DeleteTaskRequest)) @@ -506,7 +454,7 @@ func _Scheduler_AnnounceHost_Handler(srv interface{}, ctx context.Context, dec f } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_AnnounceHost_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/AnnounceHost", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).AnnounceHost(ctx, req.(*AnnounceHostRequest)) @@ -524,7 +472,7 @@ func _Scheduler_DeleteHost_Handler(srv interface{}, ctx context.Context, dec fun } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_DeleteHost_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/DeleteHost", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).DeleteHost(ctx, req.(*DeleteHostRequest)) @@ -533,7 +481,7 @@ func _Scheduler_DeleteHost_Handler(srv interface{}, ctx context.Context, dec fun } func _Scheduler_SyncProbes_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(SchedulerServer).SyncProbes(&schedulerSyncProbesServer{ServerStream: stream}) + return srv.(SchedulerServer).SyncProbes(&schedulerSyncProbesServer{stream}) } type Scheduler_SyncProbesServer interface { @@ -559,7 +507,7 @@ func (x *schedulerSyncProbesServer) Recv() (*SyncProbesRequest, error) { } func _Scheduler_AnnounceCachePeer_Handler(srv interface{}, stream grpc.ServerStream) error { - return srv.(SchedulerServer).AnnounceCachePeer(&schedulerAnnounceCachePeerServer{ServerStream: stream}) + return srv.(SchedulerServer).AnnounceCachePeer(&schedulerAnnounceCachePeerServer{stream}) } type Scheduler_AnnounceCachePeerServer interface { @@ -594,7 +542,7 @@ func _Scheduler_StatCachePeer_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_StatCachePeer_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/StatCachePeer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).StatCachePeer(ctx, req.(*StatCachePeerRequest)) @@ -612,7 +560,7 @@ func _Scheduler_DeleteCachePeer_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_DeleteCachePeer_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/DeleteCachePeer", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).DeleteCachePeer(ctx, req.(*DeleteCachePeerRequest)) @@ -630,7 +578,7 @@ func _Scheduler_UploadCacheTask_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_UploadCacheTask_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/UploadCacheTask", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).UploadCacheTask(ctx, req.(*UploadCacheTaskRequest)) @@ -648,7 +596,7 @@ func _Scheduler_StatCacheTask_Handler(srv interface{}, ctx context.Context, dec } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_StatCacheTask_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/StatCacheTask", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).StatCacheTask(ctx, req.(*StatCacheTaskRequest)) @@ -666,7 +614,7 @@ func _Scheduler_DeleteCacheTask_Handler(srv interface{}, ctx context.Context, de } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: Scheduler_DeleteCacheTask_FullMethodName, + FullMethod: "/scheduler.v2.Scheduler/DeleteCacheTask", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { return srv.(SchedulerServer).DeleteCacheTask(ctx, req.(*DeleteCacheTaskRequest)) diff --git a/src/descriptor.bin b/src/descriptor.bin index 1084a34..a18bbd1 100644 Binary files a/src/descriptor.bin and b/src/descriptor.bin differ