resolve conflict

Signed-off-by: bufferflies <[email protected]>
tikv · Aug 12, 2022 · 186ca2c · 186ca2c
1 parent 70b413f
commit 186ca2c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/server/grpc_service.go b/server/grpc_service.go
@@ -1491,7 +1491,10 @@ func (s *GrpcServer) validateRequest(header *pdpb.RequestHeader) error {
 
 func (s *GrpcServer) header() *pdpb.ResponseHeader {
 	if s.clusterID == 0 {
-		return s.wrapErrorToHeader(pdpb.ErrorType_NOT_BOOTSTRAPPED, "cluster id is not ready")
+		return s.errorHeader(&pdpb.Error{
+			Type:    pdpb.ErrorType_NOT_BOOTSTRAPPED,
+			Message: "cluster id is not ready",
+		})
 	}
 	return &pdpb.ResponseHeader{ClusterId: s.clusterID}
 }