From 46cec298dbdd154b57fd22ac1bb3ae8ccd9ae68b Mon Sep 17 00:00:00 2001 From: rishabh_mittal Date: Fri, 18 Aug 2023 09:15:48 -0700 Subject: [PATCH] review comments Signed-off-by: rishabh_mittal --- server/grpc_service.go | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/server/grpc_service.go b/server/grpc_service.go index e93e117f77c..04e908c357b 100644 --- a/server/grpc_service.go +++ b/server/grpc_service.go @@ -1620,13 +1620,19 @@ func (s *GrpcServer) ScatterRegion(ctx context.Context, request *pdpb.ScatterReg if err != nil { return nil, err } - if op != nil { - if op != nil && !rc.GetOperatorController().AddOperator(op) { - return &pdpb.ScatterRegionResponse{ - Header: s.wrapErrorToHeader(pdpb.ErrorType_UNKNOWN, - "operator cancelled because store limit exceeded"), - }, nil - } + + if op == nil { + return &pdpb.ScatterRegionResponse{ + Header: s.wrapErrorToHeader(pdpb.ErrorType_UNKNOWN, + "operator could not be allocated"), + }, nil + } + + if !rc.GetOperatorController().AddOperator(op) { + return &pdpb.ScatterRegionResponse{ + Header: s.wrapErrorToHeader(pdpb.ErrorType_UNKNOWN, + "operator cancelled because store limit exceeded"), + }, nil } return &pdpb.ScatterRegionResponse{