From 186ca2c7817918d29dfd3c2fae8939e7329aa7e3 Mon Sep 17 00:00:00 2001
From: bufferflies <1045931706@qq.com>
Date: Fri, 12 Aug 2022 11:52:24 +0800
Subject: [PATCH] resolve conflict

Signed-off-by: bufferflies <1045931706@qq.com>
---
 server/grpc_service.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/server/grpc_service.go b/server/grpc_service.go
index d49b0f7e95f..6ffdb7afe0b 100644
--- 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}
 }