From 89ddfb45877edc21335e8ab4733fcc6fb79b61d9 Mon Sep 17 00:00:00 2001 From: Garrybest Date: Sat, 22 Jan 2022 12:32:17 +0800 Subject: [PATCH] move estimator service protos Signed-off-by: Garrybest --- pkg/estimator/client/cache.go | 10 +- pkg/estimator/pb/generated.pb.go | 231 +++++--------------- pkg/estimator/pb/generated.proto | 6 +- pkg/estimator/pb/service.proto | 13 -- pkg/estimator/pb/types.go | 2 +- pkg/estimator/server/server.go | 3 +- pkg/estimator/{pb => service}/service.pb.go | 77 +++---- pkg/estimator/service/service.proto | 13 ++ 8 files changed, 116 insertions(+), 239 deletions(-) delete mode 100644 pkg/estimator/pb/service.proto rename pkg/estimator/{pb => service}/service.pb.go (56%) create mode 100644 pkg/estimator/service/service.proto diff --git a/pkg/estimator/client/cache.go b/pkg/estimator/client/cache.go index 62ce81904..a7a041803 100644 --- a/pkg/estimator/client/cache.go +++ b/pkg/estimator/client/cache.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc" "k8s.io/klog/v2" - "github.com/karmada-io/karmada/pkg/estimator/pb" + estimatorservice "github.com/karmada-io/karmada/pkg/estimator/service" "github.com/karmada-io/karmada/pkg/util" "github.com/karmada-io/karmada/pkg/util/names" ) @@ -28,7 +28,7 @@ func NewSchedulerEstimatorCache() *SchedulerEstimatorCache { type clientWrapper struct { connection *grpc.ClientConn - client pb.EstimatorClient + client estimatorservice.EstimatorClient } // IsEstimatorExist checks whether the cluster estimator exists in the cache. @@ -40,7 +40,7 @@ func (c *SchedulerEstimatorCache) IsEstimatorExist(name string) bool { } // AddCluster adds a grpc connection and associated client into the cache. -func (c *SchedulerEstimatorCache) AddCluster(name string, connection *grpc.ClientConn, client pb.EstimatorClient) { +func (c *SchedulerEstimatorCache) AddCluster(name string, connection *grpc.ClientConn, client estimatorservice.EstimatorClient) { c.lock.Lock() defer c.lock.Unlock() // If more than one worker have established connections at the same time, @@ -68,7 +68,7 @@ func (c *SchedulerEstimatorCache) DeleteCluster(name string) { } // GetClient returns the gRPC client of a cluster accurate replica estimator. -func (c *SchedulerEstimatorCache) GetClient(name string) (pb.EstimatorClient, error) { +func (c *SchedulerEstimatorCache) GetClient(name string) (estimatorservice.EstimatorClient, error) { c.lock.RLock() defer c.lock.RUnlock() es, exist := c.estimator[name] @@ -90,7 +90,7 @@ func EstablishConnection(name string, estimatorCache *SchedulerEstimatorCache, p klog.Errorf("Failed to dial cluster(%s): %v.", name, err) return err } - c := pb.NewEstimatorClient(cc) + c := estimatorservice.NewEstimatorClient(cc) estimatorCache.AddCluster(name, cc, c) klog.Infof("Connection with estimator server(%s) of cluster(%s) has been established.", serverAddr, name) return nil diff --git a/pkg/estimator/pb/generated.pb.go b/pkg/estimator/pb/generated.pb.go index b93b6b23b..66022d7d9 100644 --- a/pkg/estimator/pb/generated.pb.go +++ b/pkg/estimator/pb/generated.pb.go @@ -173,38 +173,10 @@ func (m *ReplicaRequirements) XXX_DiscardUnknown() { var xxx_messageInfo_ReplicaRequirements proto.InternalMessageInfo -func (m *UnimplementedEstimatorServer) Reset() { *m = UnimplementedEstimatorServer{} } -func (*UnimplementedEstimatorServer) ProtoMessage() {} -func (*UnimplementedEstimatorServer) Descriptor() ([]byte, []int) { - return fileDescriptor_9773618571bdb725, []int{5} -} -func (m *UnimplementedEstimatorServer) XXX_Unmarshal(b []byte) error { - return m.Unmarshal(b) -} -func (m *UnimplementedEstimatorServer) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - b = b[:cap(b)] - n, err := m.MarshalToSizedBuffer(b) - if err != nil { - return nil, err - } - return b[:n], nil -} -func (m *UnimplementedEstimatorServer) XXX_Merge(src proto.Message) { - xxx_messageInfo_UnimplementedEstimatorServer.Merge(m, src) -} -func (m *UnimplementedEstimatorServer) XXX_Size() int { - return m.Size() -} -func (m *UnimplementedEstimatorServer) XXX_DiscardUnknown() { - xxx_messageInfo_UnimplementedEstimatorServer.DiscardUnknown(m) -} - -var xxx_messageInfo_UnimplementedEstimatorServer proto.InternalMessageInfo - func (m *UnschedulableReplicasRequest) Reset() { *m = UnschedulableReplicasRequest{} } func (*UnschedulableReplicasRequest) ProtoMessage() {} func (*UnschedulableReplicasRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_9773618571bdb725, []int{6} + return fileDescriptor_9773618571bdb725, []int{5} } func (m *UnschedulableReplicasRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -232,7 +204,7 @@ var xxx_messageInfo_UnschedulableReplicasRequest proto.InternalMessageInfo func (m *UnschedulableReplicasResponse) Reset() { *m = UnschedulableReplicasResponse{} } func (*UnschedulableReplicasResponse) ProtoMessage() {} func (*UnschedulableReplicasResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_9773618571bdb725, []int{7} + return fileDescriptor_9773618571bdb725, []int{6} } func (m *UnschedulableReplicasResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -265,7 +237,6 @@ func init() { proto.RegisterType((*ObjectReference)(nil), "github.com.karmada_io.karmada.pkg.estimator.pb.ObjectReference") proto.RegisterType((*ReplicaRequirements)(nil), "github.com.karmada_io.karmada.pkg.estimator.pb.ReplicaRequirements") proto.RegisterMapType((k8s_io_api_core_v1.ResourceList)(nil), "github.com.karmada_io.karmada.pkg.estimator.pb.ReplicaRequirements.ResourceRequestEntry") - proto.RegisterType((*UnimplementedEstimatorServer)(nil), "github.com.karmada_io.karmada.pkg.estimator.pb.UnimplementedEstimatorServer") proto.RegisterType((*UnschedulableReplicasRequest)(nil), "github.com.karmada_io.karmada.pkg.estimator.pb.UnschedulableReplicasRequest") proto.RegisterType((*UnschedulableReplicasResponse)(nil), "github.com.karmada_io.karmada.pkg.estimator.pb.UnschedulableReplicasResponse") } @@ -275,60 +246,59 @@ func init() { } var fileDescriptor_9773618571bdb725 = []byte{ - // 846 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x41, 0x8f, 0xdb, 0x44, - 0x14, 0x8e, 0x93, 0xad, 0xda, 0x4c, 0xb6, 0xda, 0xad, 0x77, 0xa9, 0xa2, 0xb4, 0x75, 0x22, 0x9f, - 0x96, 0x43, 0xc7, 0x6a, 0x04, 0x52, 0xe1, 0x40, 0xb5, 0xde, 0xf6, 0x80, 0x4a, 0x17, 0x98, 0x76, - 0x2b, 0x40, 0x42, 0x68, 0x62, 0xbf, 0x24, 0x43, 0x6c, 0x8f, 0x19, 0x8f, 0xa3, 0x5d, 0x4e, 0x08, - 0xc4, 0x1d, 0xf1, 0x0f, 0xf8, 0x1b, 0xfc, 0x82, 0x3d, 0xf6, 0x82, 0xd4, 0x0b, 0x81, 0x84, 0x7f, - 0xd1, 0x13, 0xf2, 0x78, 0x9c, 0x38, 0x59, 0x2f, 0xd2, 0x02, 0xb7, 0x99, 0x79, 0xdf, 0xfb, 0xde, - 0x37, 0x6f, 0xbe, 0x79, 0xe8, 0x83, 0x11, 0x93, 0xe3, 0x74, 0x80, 0x3d, 0x1e, 0x3a, 0x13, 0x2a, - 0x42, 0xea, 0xd3, 0xfb, 0x8c, 0x17, 0x4b, 0x27, 0x9e, 0x8c, 0x1c, 0x48, 0x24, 0x0b, 0xa9, 0xe4, - 0xc2, 0x89, 0x07, 0xce, 0x08, 0x22, 0x10, 0x54, 0x82, 0x8f, 0x63, 0xc1, 0x25, 0x37, 0xf1, 0x2a, - 0x1f, 0xeb, 0xa4, 0xaf, 0x18, 0x2f, 0x96, 0x38, 0x9e, 0x8c, 0xf0, 0x32, 0x1f, 0xc7, 0x83, 0xce, - 0xfd, 0x52, 0xbd, 0x11, 0x1f, 0x71, 0x47, 0xd1, 0x0c, 0xd2, 0xa1, 0xda, 0xa9, 0x8d, 0x5a, 0xe5, - 0xf4, 0x1d, 0x7b, 0xf2, 0x30, 0xc1, 0x8c, 0x3b, 0x34, 0x66, 0x8e, 0xc7, 0x05, 0x38, 0xd3, 0x07, - 0x9b, 0x12, 0x3a, 0xef, 0xac, 0x30, 0x21, 0xf5, 0xc6, 0x2c, 0x02, 0x71, 0xa6, 0x84, 0x67, 0x49, - 0x02, 0x12, 0x9e, 0x0a, 0x0f, 0x36, 0xb3, 0xec, 0xdf, 0x0d, 0x74, 0xe7, 0x19, 0x3d, 0x3d, 0x9c, - 0x52, 0x16, 0xd0, 0x41, 0x00, 0x04, 0xe2, 0x80, 0x79, 0x34, 0x21, 0xf0, 0x4d, 0x0a, 0x89, 0x34, - 0xdf, 0x46, 0xd7, 0xbd, 0x20, 0x4d, 0x24, 0x88, 0xb6, 0xd1, 0x33, 0x0e, 0x9a, 0xee, 0xce, 0xf9, - 0xac, 0x5b, 0x5b, 0xcc, 0xba, 0xd7, 0x8f, 0xf2, 0x63, 0x52, 0xc4, 0xcd, 0x9f, 0x0d, 0xb4, 0x27, - 0xf2, 0xf4, 0x2c, 0x9b, 0x09, 0x08, 0x21, 0x92, 0x49, 0xbb, 0xde, 0x33, 0x0e, 0x5a, 0xfd, 0xa3, - 0x2b, 0xb6, 0x08, 0x93, 0x8b, 0x54, 0xee, 0x1d, 0x5d, 0x7c, 0xaf, 0x22, 0x48, 0xaa, 0x8a, 0xdb, - 0x27, 0xe8, 0x6e, 0xf5, 0xf5, 0x92, 0x98, 0x47, 0x09, 0x98, 0xef, 0xa2, 0x56, 0x48, 0x4f, 0x8b, - 0x63, 0x75, 0xc7, 0x6b, 0xee, 0x9e, 0x2e, 0xd3, 0x7a, 0xb6, 0x0a, 0x91, 0x32, 0xce, 0xfe, 0xa1, - 0x81, 0x9a, 0xc7, 0xdc, 0x87, 0xa3, 0x80, 0xb2, 0xd0, 0x7c, 0x89, 0xb6, 0x23, 0xee, 0xc3, 0xe1, - 0x70, 0xc8, 0x22, 0x26, 0xcf, 0x14, 0x4b, 0xab, 0xdf, 0xc3, 0xf9, 0x8b, 0x60, 0x1a, 0x33, 0x9c, - 0xbd, 0x1a, 0x9e, 0x3e, 0xc0, 0x59, 0xd2, 0x73, 0x08, 0xc0, 0x93, 0x5c, 0xb8, 0xbb, 0x8b, 0x59, - 0x77, 0xfb, 0xb8, 0x94, 0x49, 0xd6, 0x78, 0xcc, 0x1f, 0x8d, 0x9c, 0xb8, 0x48, 0x68, 0xd7, 0x7b, - 0x8d, 0x83, 0x56, 0xff, 0xe9, 0x55, 0x5b, 0xb9, 0x54, 0xba, 0x56, 0xfe, 0x49, 0x24, 0xc5, 0x99, - 0xbb, 0xaf, 0xef, 0xba, 0x5d, 0x0e, 0x91, 0xb5, 0xb2, 0xe6, 0x09, 0x6a, 0x49, 0x1e, 0x64, 0xbe, - 0x61, 0x3c, 0x4a, 0xda, 0x0d, 0xa5, 0xc2, 0xaa, 0xba, 0xde, 0x8b, 0x25, 0x6c, 0xd5, 0xc4, 0xd5, - 0x59, 0x42, 0xca, 0x3c, 0x9d, 0x47, 0xe8, 0xd6, 0x05, 0x3d, 0xe6, 0x2e, 0x6a, 0x4c, 0x20, 0x6f, - 0x61, 0x93, 0x64, 0x4b, 0x73, 0x1f, 0x5d, 0x9b, 0xd2, 0x20, 0x05, 0x65, 0xa4, 0x26, 0xc9, 0x37, - 0xef, 0xd7, 0x1f, 0x1a, 0xf6, 0xaf, 0x06, 0xda, 0xf9, 0x78, 0xf0, 0x35, 0x78, 0x92, 0xc0, 0x10, - 0x04, 0x44, 0x1e, 0x98, 0x7d, 0x84, 0x68, 0xcc, 0x5e, 0x82, 0x48, 0x18, 0x8f, 0xb4, 0x67, 0x4d, - 0x2d, 0x05, 0x1d, 0x7e, 0xf2, 0xa1, 0x8e, 0x90, 0x12, 0xca, 0xec, 0xa1, 0xad, 0x09, 0x8b, 0xfc, - 0xbc, 0x80, 0xbb, 0xad, 0xd1, 0x5b, 0x4f, 0x59, 0xe4, 0x13, 0x15, 0x31, 0x1d, 0xd4, 0x8c, 0x68, - 0x08, 0x49, 0x4c, 0x3d, 0x68, 0x37, 0x14, 0xec, 0x96, 0x86, 0x35, 0x8f, 0x8b, 0x00, 0x59, 0x61, - 0x32, 0xca, 0x6c, 0xd3, 0xde, 0x5a, 0xa7, 0xcc, 0xb0, 0x44, 0x45, 0xec, 0xdf, 0x1a, 0xa8, 0xca, - 0xc6, 0xe6, 0x10, 0x35, 0xa3, 0xe2, 0xbd, 0xb4, 0x93, 0xde, 0xfb, 0xd7, 0x0f, 0xee, 0xde, 0x54, - 0x0a, 0x8b, 0x2d, 0x59, 0x51, 0x9b, 0x73, 0x03, 0xed, 0x14, 0x63, 0x41, 0xff, 0x76, 0xed, 0xaf, - 0xcf, 0xfe, 0x87, 0xaf, 0x8a, 0xc9, 0x3a, 0x75, 0x6e, 0xb6, 0x2f, 0x75, 0x1f, 0x76, 0x36, 0xa2, - 0x6f, 0x66, 0xdd, 0xee, 0xc5, 0x11, 0xb7, 0xe4, 0xf8, 0x88, 0x25, 0xf2, 0xfb, 0x3f, 0xfe, 0x11, - 0xa2, 0x1a, 0xbb, 0x79, 0x9f, 0x8e, 0x40, 0xfb, 0x55, 0x3a, 0x2a, 0x4c, 0xf6, 0xb8, 0x6c, 0xb2, - 0x56, 0x1f, 0x97, 0xcc, 0xbd, 0x9c, 0xa6, 0xea, 0xe2, 0x99, 0xdb, 0x8b, 0x32, 0xf8, 0xd3, 0x94, - 0x46, 0x32, 0xfb, 0xb7, 0x25, 0x53, 0x5a, 0xe8, 0xee, 0x49, 0xc4, 0xc2, 0x38, 0x50, 0x8d, 0x00, - 0xff, 0x49, 0xd1, 0xa9, 0xe7, 0x20, 0xa6, 0x20, 0xec, 0x5f, 0xea, 0x19, 0x20, 0xf1, 0xc6, 0xe0, - 0xa7, 0xff, 0x75, 0xe4, 0x86, 0xe8, 0x46, 0xa1, 0x45, 0x0b, 0x7f, 0x74, 0xd5, 0xb7, 0xdb, 0xf8, - 0x3f, 0xee, 0xae, 0x2e, 0x76, 0x63, 0xd9, 0xb8, 0x65, 0x09, 0x73, 0x84, 0x6e, 0xa7, 0x65, 0xe5, - 0x2f, 0xc6, 0x02, 0x92, 0x31, 0x0f, 0x7c, 0xf5, 0x25, 0x1a, 0xae, 0xa3, 0x73, 0x6f, 0x9f, 0x54, - 0xa2, 0xde, 0xcc, 0xba, 0x37, 0x25, 0x0b, 0x01, 0x3f, 0x4e, 0xf3, 0x11, 0x40, 0x2e, 0xa1, 0xb3, - 0xbf, 0x45, 0xf7, 0x2e, 0x69, 0x91, 0x1e, 0xdb, 0x9f, 0xa3, 0x76, 0x48, 0x4f, 0x2b, 0x31, 0x7a, - 0x86, 0xdf, 0xd3, 0x5a, 0xde, 0xaa, 0x26, 0xba, 0x34, 0xdd, 0x3d, 0x38, 0x9f, 0x5b, 0xb5, 0x57, - 0x73, 0xab, 0xf6, 0x7a, 0x6e, 0xd5, 0xbe, 0x5b, 0x58, 0xc6, 0xf9, 0xc2, 0x32, 0x5e, 0x2d, 0x2c, - 0xe3, 0xf5, 0xc2, 0x32, 0xfe, 0x5c, 0x58, 0xc6, 0x4f, 0x7f, 0x59, 0xb5, 0x2f, 0xea, 0xf1, 0xe0, - 0xef, 0x00, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x34, 0x7f, 0xd7, 0x35, 0x08, 0x00, 0x00, + // 826 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0x41, 0x6f, 0x1b, 0x45, + 0x14, 0xf6, 0xda, 0xa9, 0x5a, 0x8f, 0x53, 0x25, 0xdd, 0xa4, 0x95, 0xe5, 0xb6, 0x6b, 0xcb, 0xa7, + 0x70, 0xe8, 0xac, 0x6a, 0x81, 0x54, 0x38, 0x50, 0x65, 0x53, 0x0e, 0xa8, 0x34, 0xc0, 0xb4, 0xa9, + 0x10, 0x12, 0x42, 0xe3, 0xdd, 0x67, 0x7b, 0xf0, 0xee, 0xce, 0x32, 0x33, 0x1b, 0x35, 0x37, 0x04, + 0xe2, 0x8e, 0xf8, 0x07, 0xfc, 0x0d, 0x7e, 0x41, 0x8e, 0xbd, 0x20, 0xf5, 0x82, 0xc1, 0xe6, 0x5f, + 0xf4, 0x84, 0x76, 0x76, 0xd6, 0x5e, 0x3b, 0x1b, 0xa4, 0x00, 0xb7, 0x99, 0x79, 0xdf, 0xf7, 0xbd, + 0x37, 0x6f, 0xbe, 0x79, 0xe8, 0xc3, 0x31, 0x53, 0x93, 0x74, 0x88, 0x7d, 0x1e, 0xb9, 0x53, 0x2a, + 0x22, 0x1a, 0xd0, 0x07, 0x8c, 0x17, 0x4b, 0x37, 0x99, 0x8e, 0x5d, 0x90, 0x8a, 0x45, 0x54, 0x71, + 0xe1, 0x26, 0x43, 0x77, 0x0c, 0x31, 0x08, 0xaa, 0x20, 0xc0, 0x89, 0xe0, 0x8a, 0xdb, 0x78, 0xc5, + 0xc7, 0x86, 0xf4, 0x35, 0xe3, 0xc5, 0x12, 0x27, 0xd3, 0x31, 0x5e, 0xf2, 0x71, 0x32, 0xec, 0x3c, + 0x28, 0xe5, 0x1b, 0xf3, 0x31, 0x77, 0xb5, 0xcc, 0x30, 0x1d, 0xe9, 0x9d, 0xde, 0xe8, 0x55, 0x2e, + 0xdf, 0xe9, 0x4f, 0x1f, 0x49, 0xcc, 0xb8, 0x4b, 0x13, 0xe6, 0xfa, 0x5c, 0x80, 0x7b, 0xfa, 0x70, + 0xb3, 0x84, 0xce, 0xbb, 0x2b, 0x4c, 0x44, 0xfd, 0x09, 0x8b, 0x41, 0x9c, 0xe9, 0xc2, 0x33, 0x92, + 0x00, 0xc9, 0x53, 0xe1, 0xc3, 0x26, 0xab, 0xff, 0xbb, 0x85, 0xee, 0x3e, 0xa3, 0xaf, 0x0e, 0x4f, + 0x29, 0x0b, 0xe9, 0x30, 0x04, 0x02, 0x49, 0xc8, 0x7c, 0x2a, 0x09, 0x7c, 0x9b, 0x82, 0x54, 0xf6, + 0x3b, 0xe8, 0xba, 0x1f, 0xa6, 0x52, 0x81, 0x68, 0x5b, 0x3d, 0xeb, 0xa0, 0xe9, 0xed, 0x9c, 0xcf, + 0xba, 0xb5, 0xc5, 0xac, 0x7b, 0xfd, 0x28, 0x3f, 0x26, 0x45, 0xdc, 0xfe, 0xd9, 0x42, 0x7b, 0x22, + 0xa7, 0x67, 0x6c, 0x26, 0x20, 0x82, 0x58, 0xc9, 0x76, 0xbd, 0x67, 0x1d, 0xb4, 0x06, 0x47, 0x57, + 0x6c, 0x11, 0x26, 0x17, 0xa5, 0xbc, 0xbb, 0x26, 0xf9, 0x5e, 0x45, 0x90, 0x54, 0x25, 0xef, 0x9f, + 0xa0, 0x7b, 0xd5, 0xd7, 0x93, 0x09, 0x8f, 0x25, 0xd8, 0xef, 0xa1, 0x56, 0x44, 0x5f, 0x15, 0xc7, + 0xfa, 0x8e, 0xd7, 0xbc, 0x3d, 0x93, 0xa6, 0xf5, 0x6c, 0x15, 0x22, 0x65, 0x5c, 0xff, 0x87, 0x06, + 0x6a, 0x1e, 0xf3, 0x00, 0x8e, 0x42, 0xca, 0x22, 0xfb, 0x25, 0xda, 0x8e, 0x79, 0x00, 0x87, 0xa3, + 0x11, 0x8b, 0x99, 0x3a, 0xd3, 0x2a, 0xad, 0x41, 0x0f, 0xe7, 0x2f, 0x82, 0x69, 0xc2, 0x70, 0xf6, + 0x6a, 0xf8, 0xf4, 0x21, 0xce, 0x48, 0xcf, 0x21, 0x04, 0x5f, 0x71, 0xe1, 0xed, 0x2e, 0x66, 0xdd, + 0xed, 0xe3, 0x12, 0x93, 0xac, 0xe9, 0xd8, 0x3f, 0x5a, 0xb9, 0x70, 0x41, 0x68, 0xd7, 0x7b, 0x8d, + 0x83, 0xd6, 0xe0, 0xe9, 0x55, 0x5b, 0xb9, 0xac, 0x74, 0x2d, 0xfd, 0x47, 0xb1, 0x12, 0x67, 0xde, + 0xbe, 0xb9, 0xeb, 0x76, 0x39, 0x44, 0xd6, 0xd2, 0xda, 0x27, 0xa8, 0xa5, 0x78, 0x98, 0xf9, 0x86, + 0xf1, 0x58, 0xb6, 0x1b, 0xba, 0x0a, 0xa7, 0xea, 0x7a, 0x2f, 0x96, 0xb0, 0x55, 0x13, 0x57, 0x67, + 0x92, 0x94, 0x75, 0x3a, 0x8f, 0xd1, 0xad, 0x0b, 0xf5, 0xd8, 0xbb, 0xa8, 0x31, 0x85, 0xbc, 0x85, + 0x4d, 0x92, 0x2d, 0xed, 0x7d, 0x74, 0xed, 0x94, 0x86, 0x29, 0x68, 0x23, 0x35, 0x49, 0xbe, 0xf9, + 0xa0, 0xfe, 0xc8, 0xea, 0xff, 0x6a, 0xa1, 0x9d, 0x4f, 0x87, 0xdf, 0x80, 0xaf, 0x08, 0x8c, 0x40, + 0x40, 0xec, 0x83, 0x3d, 0x40, 0x88, 0x26, 0xec, 0x25, 0x08, 0xc9, 0x78, 0x6c, 0x3c, 0x6b, 0x9b, + 0x52, 0xd0, 0xe1, 0x67, 0x1f, 0x9b, 0x08, 0x29, 0xa1, 0xec, 0x1e, 0xda, 0x9a, 0xb2, 0x38, 0xc8, + 0x13, 0x78, 0xdb, 0x06, 0xbd, 0xf5, 0x94, 0xc5, 0x01, 0xd1, 0x11, 0xdb, 0x45, 0xcd, 0x98, 0x46, + 0x20, 0x13, 0xea, 0x43, 0xbb, 0xa1, 0x61, 0xb7, 0x0c, 0xac, 0x79, 0x5c, 0x04, 0xc8, 0x0a, 0x93, + 0x49, 0x66, 0x9b, 0xf6, 0xd6, 0xba, 0x64, 0x86, 0x25, 0x3a, 0xd2, 0xff, 0xad, 0x81, 0xaa, 0x6c, + 0x6c, 0x8f, 0x50, 0x33, 0x2e, 0xde, 0xcb, 0x38, 0xe9, 0xfd, 0x7f, 0xfd, 0xe0, 0xde, 0x4d, 0x5d, + 0x61, 0xb1, 0x25, 0x2b, 0x69, 0x7b, 0x6e, 0xa1, 0x9d, 0x62, 0x2c, 0x98, 0xdf, 0x6e, 0xfc, 0xf5, + 0xc5, 0xff, 0xf0, 0x55, 0x31, 0x59, 0x97, 0xce, 0xcd, 0xf6, 0x95, 0xe9, 0xc3, 0xce, 0x46, 0xf4, + 0xed, 0xac, 0xdb, 0xbd, 0x38, 0xe2, 0x96, 0x1a, 0x9f, 0x30, 0xa9, 0xbe, 0xff, 0xe3, 0x1f, 0x21, + 0xba, 0xb1, 0x9b, 0xf7, 0xe9, 0x08, 0xb4, 0x5f, 0x55, 0x47, 0x85, 0xc9, 0x9e, 0x94, 0x4d, 0xd6, + 0x1a, 0xe0, 0x92, 0xb9, 0x97, 0xd3, 0x54, 0x5f, 0x3c, 0x73, 0x7b, 0x91, 0x06, 0x7f, 0x9e, 0xd2, + 0x58, 0x65, 0xff, 0xb6, 0x64, 0xca, 0x5f, 0xea, 0xe8, 0xde, 0x49, 0x2c, 0xfd, 0x09, 0x04, 0xe9, + 0x7f, 0x1d, 0xa9, 0x11, 0xba, 0x51, 0xe4, 0x32, 0x85, 0x3d, 0xbe, 0xea, 0xdb, 0x6c, 0xfc, 0x0f, + 0x6f, 0xd7, 0x24, 0xbb, 0xb1, 0x6c, 0xcc, 0x32, 0x85, 0x3d, 0x46, 0x77, 0xd2, 0x72, 0xe5, 0x2f, + 0x26, 0x02, 0xe4, 0x84, 0x87, 0x81, 0xb6, 0x7c, 0xc3, 0x73, 0x0d, 0xf7, 0xce, 0x49, 0x25, 0xea, + 0xed, 0xac, 0x7b, 0x53, 0xb1, 0x08, 0xf0, 0x93, 0x34, 0xff, 0xe2, 0xe4, 0x12, 0xb9, 0xbe, 0x42, + 0xf7, 0x2f, 0x69, 0x91, 0x19, 0xcb, 0xcf, 0xd1, 0xed, 0xb4, 0x0a, 0x60, 0x06, 0xf4, 0x7d, 0x53, + 0xc8, 0xed, 0x6a, 0x95, 0x6a, 0xae, 0x77, 0x70, 0x3e, 0x77, 0x6a, 0xaf, 0xe7, 0x4e, 0xed, 0xcd, + 0xdc, 0xa9, 0x7d, 0xb7, 0x70, 0xac, 0xf3, 0x85, 0x63, 0xbd, 0x5e, 0x38, 0xd6, 0x9b, 0x85, 0x63, + 0xfd, 0xb9, 0x70, 0xac, 0x9f, 0xfe, 0x72, 0x6a, 0x5f, 0xd6, 0x93, 0xe1, 0xdf, 0x01, 0x00, 0x00, + 0xff, 0xff, 0x04, 0x00, 0x5c, 0x65, 0x0f, 0x08, 0x00, 0x00, } func (m *MaxAvailableReplicasRequest) Marshal() (dAtA []byte, err error) { @@ -575,29 +545,6 @@ func (m *ReplicaRequirements) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } -func (m *UnimplementedEstimatorServer) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalToSizedBuffer(dAtA[:size]) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *UnimplementedEstimatorServer) MarshalTo(dAtA []byte) (int, error) { - size := m.Size() - return m.MarshalToSizedBuffer(dAtA[:size]) -} - -func (m *UnimplementedEstimatorServer) MarshalToSizedBuffer(dAtA []byte) (int, error) { - i := len(dAtA) - _ = i - var l int - _ = l - return len(dAtA) - i, nil -} - func (m *UnschedulableReplicasRequest) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -765,15 +712,6 @@ func (m *ReplicaRequirements) Size() (n int) { return n } -func (m *UnimplementedEstimatorServer) Size() (n int) { - if m == nil { - return 0 - } - var l int - _ = l - return n -} - func (m *UnschedulableReplicasRequest) Size() (n int) { if m == nil { return 0 @@ -886,15 +824,6 @@ func (this *ReplicaRequirements) String() string { }, "") return s } -func (this *UnimplementedEstimatorServer) String() string { - if this == nil { - return "nil" - } - s := strings.Join([]string{`&UnimplementedEstimatorServer{`, - `}`, - }, "") - return s -} func (this *UnschedulableReplicasRequest) String() string { if this == nil { return "nil" @@ -1749,56 +1678,6 @@ func (m *ReplicaRequirements) Unmarshal(dAtA []byte) error { } return nil } -func (m *UnimplementedEstimatorServer) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowGenerated - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= uint64(b&0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: UnimplementedEstimatorServer: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: UnimplementedEstimatorServer: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - default: - iNdEx = preIndex - skippy, err := skipGenerated(dAtA[iNdEx:]) - if err != nil { - return err - } - if (skippy < 0) || (iNdEx+skippy) < 0 { - return ErrInvalidLengthGenerated - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *UnschedulableReplicasRequest) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/pkg/estimator/pb/generated.proto b/pkg/estimator/pb/generated.proto index 58ec52974..373a67a4d 100644 --- a/pkg/estimator/pb/generated.proto +++ b/pkg/estimator/pb/generated.proto @@ -81,10 +81,6 @@ message ReplicaRequirements { map resourceRequest = 2; } -// UnimplementedEstimatorServer can be embedded to have forward compatible implementations. -message UnimplementedEstimatorServer { -} - // UnschedulableReplicasRequest represents the request that sent by gRPC client to calculate unschedulable replicas. message UnschedulableReplicasRequest { // Cluster represents the cluster name. @@ -105,6 +101,6 @@ message UnschedulableReplicasRequest { message UnschedulableReplicasResponse { // UnschedulableReplicas represents the unschedulable replicas that the object contains. // +required - optional int32 maxUnschedulableReplicas = 1; + optional int32 unschedulableReplicas = 1; } diff --git a/pkg/estimator/pb/service.proto b/pkg/estimator/pb/service.proto deleted file mode 100644 index dfcee8870..000000000 --- a/pkg/estimator/pb/service.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto2"; - -package github.com.karmada_io.karmada.pkg.estimator.pb; - -import "pkg/estimator/pb/generated.proto"; - -// Package-wide variables from generator "generated". -option go_package = "pb"; - -service Estimator { - rpc MaxAvailableReplicas(MaxAvailableReplicasRequest) returns (MaxAvailableReplicasResponse) {} - rpc GetUnschedulableReplicas(UnschedulableReplicasRequest) returns (UnschedulableReplicasResponse) {} -} diff --git a/pkg/estimator/pb/types.go b/pkg/estimator/pb/types.go index b6e07e09c..6f99bff28 100644 --- a/pkg/estimator/pb/types.go +++ b/pkg/estimator/pb/types.go @@ -90,5 +90,5 @@ type ObjectReference struct { type UnschedulableReplicasResponse struct { // UnschedulableReplicas represents the unschedulable replicas that the object contains. // +required - UnschedulableReplicas int32 `json:"maxUnschedulableReplicas" protobuf:"varint,1,opt,name=maxUnschedulableReplicas"` + UnschedulableReplicas int32 `json:"unschedulableReplicas" protobuf:"varint,1,opt,name=unschedulableReplicas"` } diff --git a/pkg/estimator/server/server.go b/pkg/estimator/server/server.go index 45dbfafff..c9dc4aa7a 100644 --- a/pkg/estimator/server/server.go +++ b/pkg/estimator/server/server.go @@ -22,6 +22,7 @@ import ( "github.com/karmada-io/karmada/pkg/estimator/server/metrics" nodeutil "github.com/karmada-io/karmada/pkg/estimator/server/nodes" "github.com/karmada-io/karmada/pkg/estimator/server/replica" + estimatorservice "github.com/karmada-io/karmada/pkg/estimator/service" "github.com/karmada-io/karmada/pkg/util" ) @@ -115,7 +116,7 @@ func (es *AccurateSchedulerEstimatorServer) Start(ctx context.Context) error { defer l.Close() s := grpc.NewServer() - pb.RegisterEstimatorServer(s, es) + estimatorservice.RegisterEstimatorServer(s, es) // Graceful stop when the context is cancelled. go func() { diff --git a/pkg/estimator/pb/service.pb.go b/pkg/estimator/service/service.pb.go similarity index 56% rename from pkg/estimator/pb/service.pb.go rename to pkg/estimator/service/service.pb.go index 834233400..fbaf6f448 100644 --- a/pkg/estimator/pb/service.pb.go +++ b/pkg/estimator/service/service.pb.go @@ -1,12 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: pkg/estimator/pb/service.proto +// source: service.proto -package pb +package service import ( context "context" fmt "fmt" proto "github.com/gogo/protobuf/proto" + pb "github.com/karmada-io/karmada/pkg/estimator/pb" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -24,23 +25,23 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package -func init() { proto.RegisterFile("pkg/estimator/pb/service.proto", fileDescriptor_f8ba5c092844dbe2) } +func init() { proto.RegisterFile("service.proto", fileDescriptor_a0b84a42fa06f626) } -var fileDescriptor_f8ba5c092844dbe2 = []byte{ - // 204 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x2b, 0xc8, 0x4e, 0xd7, - 0x4f, 0x2d, 0x2e, 0xc9, 0xcc, 0x4d, 0x2c, 0xc9, 0x2f, 0xd2, 0x2f, 0x48, 0xd2, 0x2f, 0x4e, 0x2d, - 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xd2, 0x4b, 0xcf, 0x2c, 0xc9, - 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcb, 0x4e, 0x2c, 0xca, 0x4d, 0x4c, 0x49, 0x8c, 0xcf, - 0xcc, 0x87, 0x31, 0xf5, 0x0a, 0xb2, 0xd3, 0xf5, 0xe0, 0xba, 0xf5, 0x0a, 0x92, 0xa4, 0x14, 0x30, - 0xcc, 0x4b, 0x4f, 0xcd, 0x4b, 0x2d, 0x4a, 0x2c, 0x49, 0x4d, 0x81, 0x98, 0x68, 0xf4, 0x97, 0x89, - 0x8b, 0xd3, 0x15, 0xa6, 0x40, 0x68, 0x33, 0x23, 0x97, 0x88, 0x6f, 0x62, 0x85, 0x63, 0x59, 0x62, - 0x66, 0x4e, 0x62, 0x52, 0x4e, 0x6a, 0x50, 0x6a, 0x41, 0x4e, 0x66, 0x72, 0x62, 0xb1, 0x90, 0x37, - 0x89, 0x36, 0xeb, 0x61, 0x33, 0x25, 0x28, 0xb5, 0xb0, 0x34, 0xb5, 0xb8, 0x44, 0xca, 0x87, 0x3a, - 0x86, 0x15, 0x17, 0xe4, 0xe7, 0x15, 0xa7, 0x2a, 0x31, 0x08, 0xed, 0x64, 0xe4, 0x92, 0x70, 0x4f, - 0x2d, 0x09, 0xcd, 0x2b, 0x4e, 0xce, 0x48, 0x4d, 0x29, 0x45, 0x75, 0x39, 0xc9, 0x96, 0x61, 0x35, - 0x06, 0xe6, 0x74, 0x5f, 0x2a, 0x99, 0x06, 0x73, 0xbb, 0x13, 0x4b, 0x14, 0x53, 0x41, 0x12, 0x20, - 0x00, 0x00, 0xff, 0xff, 0xbb, 0x1d, 0x27, 0xc0, 0xf8, 0x01, 0x00, 0x00, +var fileDescriptor_a0b84a42fa06f626 = []byte{ + // 205 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0x2d, 0x4e, 0x2d, 0x2a, + 0xcb, 0x4c, 0x4e, 0xd5, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x32, 0x4e, 0xcf, 0x2c, 0xc9, 0x28, + 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0xcb, 0x4e, 0x2c, 0xca, 0x4d, 0x4c, 0x49, 0x8c, 0xcf, 0xcc, + 0x87, 0x31, 0xf5, 0x0a, 0xb2, 0xd3, 0xf5, 0x52, 0x8b, 0x4b, 0x32, 0x73, 0x13, 0x4b, 0xf2, 0x8b, + 0xf4, 0xa0, 0x5a, 0xa5, 0x14, 0x0a, 0xb2, 0xd3, 0xf5, 0xe1, 0xc2, 0xfa, 0x05, 0x49, 0xfa, 0xe9, + 0xa9, 0x79, 0xa9, 0x45, 0x89, 0x25, 0xa9, 0x29, 0x10, 0x63, 0x8d, 0xfe, 0x32, 0x71, 0x71, 0xba, + 0xc2, 0x14, 0x08, 0x6d, 0x66, 0xe4, 0x12, 0xf1, 0x4d, 0xac, 0x70, 0x2c, 0x4b, 0xcc, 0xcc, 0x49, + 0x4c, 0xca, 0x49, 0x0d, 0x4a, 0x2d, 0xc8, 0xc9, 0x4c, 0x4e, 0x2c, 0x16, 0xf2, 0xd6, 0x23, 0xc5, + 0xfa, 0x82, 0x24, 0x3d, 0x6c, 0xa6, 0x04, 0xa5, 0x16, 0x96, 0xa6, 0x16, 0x97, 0x48, 0xf9, 0x50, + 0xc7, 0xb0, 0xe2, 0x82, 0xfc, 0xbc, 0xe2, 0x54, 0x25, 0x06, 0xa1, 0x9d, 0x8c, 0x5c, 0x12, 0xee, + 0xa9, 0x25, 0xa1, 0x79, 0xc5, 0xc9, 0x19, 0xa9, 0x29, 0xa5, 0xa8, 0x2e, 0x27, 0xd9, 0x32, 0xac, + 0xc6, 0xc0, 0x9c, 0xee, 0x4b, 0x25, 0xd3, 0x60, 0x6e, 0x77, 0xe2, 0x8c, 0x62, 0x87, 0x46, 0x16, + 0x20, 0x00, 0x00, 0xff, 0xff, 0x9f, 0xe1, 0x7a, 0x70, 0xf1, 0x01, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -55,8 +56,8 @@ const _ = grpc.SupportPackageIsVersion4 // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type EstimatorClient interface { - MaxAvailableReplicas(ctx context.Context, in *MaxAvailableReplicasRequest, opts ...grpc.CallOption) (*MaxAvailableReplicasResponse, error) - GetUnschedulableReplicas(ctx context.Context, in *UnschedulableReplicasRequest, opts ...grpc.CallOption) (*UnschedulableReplicasResponse, error) + MaxAvailableReplicas(ctx context.Context, in *pb.MaxAvailableReplicasRequest, opts ...grpc.CallOption) (*pb.MaxAvailableReplicasResponse, error) + GetUnschedulableReplicas(ctx context.Context, in *pb.UnschedulableReplicasRequest, opts ...grpc.CallOption) (*pb.UnschedulableReplicasResponse, error) } type estimatorClient struct { @@ -67,18 +68,18 @@ func NewEstimatorClient(cc *grpc.ClientConn) EstimatorClient { return &estimatorClient{cc} } -func (c *estimatorClient) MaxAvailableReplicas(ctx context.Context, in *MaxAvailableReplicasRequest, opts ...grpc.CallOption) (*MaxAvailableReplicasResponse, error) { - out := new(MaxAvailableReplicasResponse) - err := c.cc.Invoke(ctx, "/github.com.karmada_io.karmada.pkg.estimator.pb.Estimator/MaxAvailableReplicas", in, out, opts...) +func (c *estimatorClient) MaxAvailableReplicas(ctx context.Context, in *pb.MaxAvailableReplicasRequest, opts ...grpc.CallOption) (*pb.MaxAvailableReplicasResponse, error) { + out := new(pb.MaxAvailableReplicasResponse) + err := c.cc.Invoke(ctx, "/github.com.karmada_io.karmada.pkg.estimator.service.Estimator/MaxAvailableReplicas", in, out, opts...) if err != nil { return nil, err } return out, nil } -func (c *estimatorClient) GetUnschedulableReplicas(ctx context.Context, in *UnschedulableReplicasRequest, opts ...grpc.CallOption) (*UnschedulableReplicasResponse, error) { - out := new(UnschedulableReplicasResponse) - err := c.cc.Invoke(ctx, "/github.com.karmada_io.karmada.pkg.estimator.pb.Estimator/GetUnschedulableReplicas", in, out, opts...) +func (c *estimatorClient) GetUnschedulableReplicas(ctx context.Context, in *pb.UnschedulableReplicasRequest, opts ...grpc.CallOption) (*pb.UnschedulableReplicasResponse, error) { + out := new(pb.UnschedulableReplicasResponse) + err := c.cc.Invoke(ctx, "/github.com.karmada_io.karmada.pkg.estimator.service.Estimator/GetUnschedulableReplicas", in, out, opts...) if err != nil { return nil, err } @@ -87,18 +88,18 @@ func (c *estimatorClient) GetUnschedulableReplicas(ctx context.Context, in *Unsc // EstimatorServer is the server API for Estimator service. type EstimatorServer interface { - MaxAvailableReplicas(context.Context, *MaxAvailableReplicasRequest) (*MaxAvailableReplicasResponse, error) - GetUnschedulableReplicas(context.Context, *UnschedulableReplicasRequest) (*UnschedulableReplicasResponse, error) + MaxAvailableReplicas(context.Context, *pb.MaxAvailableReplicasRequest) (*pb.MaxAvailableReplicasResponse, error) + GetUnschedulableReplicas(context.Context, *pb.UnschedulableReplicasRequest) (*pb.UnschedulableReplicasResponse, error) } // UnimplementedEstimatorServer can be embedded to have forward compatible implementations. type UnimplementedEstimatorServer struct { } -func (*UnimplementedEstimatorServer) MaxAvailableReplicas(ctx context.Context, req *MaxAvailableReplicasRequest) (*MaxAvailableReplicasResponse, error) { +func (*UnimplementedEstimatorServer) MaxAvailableReplicas(ctx context.Context, req *pb.MaxAvailableReplicasRequest) (*pb.MaxAvailableReplicasResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method MaxAvailableReplicas not implemented") } -func (*UnimplementedEstimatorServer) GetUnschedulableReplicas(ctx context.Context, req *UnschedulableReplicasRequest) (*UnschedulableReplicasResponse, error) { +func (*UnimplementedEstimatorServer) GetUnschedulableReplicas(ctx context.Context, req *pb.UnschedulableReplicasRequest) (*pb.UnschedulableReplicasResponse, error) { return nil, status.Errorf(codes.Unimplemented, "method GetUnschedulableReplicas not implemented") } @@ -107,7 +108,7 @@ func RegisterEstimatorServer(s *grpc.Server, srv EstimatorServer) { } func _Estimator_MaxAvailableReplicas_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(MaxAvailableReplicasRequest) + in := new(pb.MaxAvailableReplicasRequest) if err := dec(in); err != nil { return nil, err } @@ -116,16 +117,16 @@ func _Estimator_MaxAvailableReplicas_Handler(srv interface{}, ctx context.Contex } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/github.com.karmada_io.karmada.pkg.estimator.pb.Estimator/MaxAvailableReplicas", + FullMethod: "/github.com.karmada_io.karmada.pkg.estimator.service.Estimator/MaxAvailableReplicas", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(EstimatorServer).MaxAvailableReplicas(ctx, req.(*MaxAvailableReplicasRequest)) + return srv.(EstimatorServer).MaxAvailableReplicas(ctx, req.(*pb.MaxAvailableReplicasRequest)) } return interceptor(ctx, in, info, handler) } func _Estimator_GetUnschedulableReplicas_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(UnschedulableReplicasRequest) + in := new(pb.UnschedulableReplicasRequest) if err := dec(in); err != nil { return nil, err } @@ -134,16 +135,16 @@ func _Estimator_GetUnschedulableReplicas_Handler(srv interface{}, ctx context.Co } info := &grpc.UnaryServerInfo{ Server: srv, - FullMethod: "/github.com.karmada_io.karmada.pkg.estimator.pb.Estimator/GetUnschedulableReplicas", + FullMethod: "/github.com.karmada_io.karmada.pkg.estimator.service.Estimator/GetUnschedulableReplicas", } handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(EstimatorServer).GetUnschedulableReplicas(ctx, req.(*UnschedulableReplicasRequest)) + return srv.(EstimatorServer).GetUnschedulableReplicas(ctx, req.(*pb.UnschedulableReplicasRequest)) } return interceptor(ctx, in, info, handler) } var _Estimator_serviceDesc = grpc.ServiceDesc{ - ServiceName: "github.com.karmada_io.karmada.pkg.estimator.pb.Estimator", + ServiceName: "github.com.karmada_io.karmada.pkg.estimator.service.Estimator", HandlerType: (*EstimatorServer)(nil), Methods: []grpc.MethodDesc{ { @@ -156,5 +157,5 @@ var _Estimator_serviceDesc = grpc.ServiceDesc{ }, }, Streams: []grpc.StreamDesc{}, - Metadata: "pkg/estimator/pb/service.proto", + Metadata: "service.proto", } diff --git a/pkg/estimator/service/service.proto b/pkg/estimator/service/service.proto new file mode 100644 index 000000000..6f095e427 --- /dev/null +++ b/pkg/estimator/service/service.proto @@ -0,0 +1,13 @@ +syntax = "proto2"; + +package github.com.karmada_io.karmada.pkg.estimator.service; + +import "pkg/estimator/pb/generated.proto"; + +// Package-wide variables from generator "generated". +option go_package = "service"; + +service Estimator { + rpc MaxAvailableReplicas(pb.MaxAvailableReplicasRequest) returns (pb.MaxAvailableReplicasResponse) {} + rpc GetUnschedulableReplicas(pb.UnschedulableReplicasRequest) returns (pb.UnschedulableReplicasResponse) {} +}