naming: Introduce UndoDemotePrimary RPC, rename request/response protos

Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
planetscale · Jul 21, 2021 · 77c231a · 77c231a
1 parent 4bd07ce
commit 77c231a
Show file tree

Hide file tree

Showing 8 changed files with 320 additions and 251 deletions.
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata.pb.go
diff --git a/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go b/go/vt/proto/tabletmanagerdata/tabletmanagerdata_vtproto.pb.go
diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice.pb.go
diff --git a/go/vt/proto/tabletmanagerservice/tabletmanagerservice_grpc.pb.go b/go/vt/proto/tabletmanagerservice/tabletmanagerservice_grpc.pb.go
diff --git a/go/vt/vttablet/grpctmclient/client.go b/go/vt/vttablet/grpctmclient/client.go
@@ -791,7 +791,18 @@ func (client *Client) UndoDemoteMaster(ctx context.Context, tablet *topodatapb.T
 		return err
 	}
 	defer closer.Close()
-	_, err = c.UndoDemoteMaster(ctx, &tabletmanagerdatapb.UndoDemoteMasterRequest{})
+	_, err = c.UndoDemoteMaster(ctx, &tabletmanagerdatapb.UndoDemotePrimaryRequest{})
+	return err
+}
+
+// UndoDemotePrimary is part of the tmclient.TabletManagerClient interface.
+func (client *Client) UndoDemotePrimary(ctx context.Context, tablet *topodatapb.Tablet) error {
+	c, closer, err := client.dialer.dial(ctx, tablet)
+	if err != nil {
+		return err
+	}
+	defer closer.Close()
+	_, err = c.UndoDemoteMaster(ctx, &tabletmanagerdatapb.UndoDemotePrimaryRequest{})
 	return err
 }
 

diff --git a/go/vt/vttablet/grpctmserver/server.go b/go/vt/vttablet/grpctmserver/server.go
@@ -413,10 +413,18 @@ func (s *server) DemoteMaster(ctx context.Context, request *tabletmanagerdatapb.
 	return response, err
 }
 
-func (s *server) UndoDemoteMaster(ctx context.Context, request *tabletmanagerdatapb.UndoDemoteMasterRequest) (response *tabletmanagerdatapb.UndoDemoteMasterResponse, err error) {
+func (s *server) UndoDemoteMaster(ctx context.Context, request *tabletmanagerdatapb.UndoDemotePrimaryRequest) (response *tabletmanagerdatapb.UndoDemotePrimaryResponse, err error) {
 	defer s.tm.HandleRPCPanic(ctx, "UndoDemoteMaster", request, response, true /*verbose*/, &err)
 	ctx = callinfo.GRPCCallInfo(ctx)
-	response = &tabletmanagerdatapb.UndoDemoteMasterResponse{}
+	response = &tabletmanagerdatapb.UndoDemotePrimaryResponse{}
+	err = s.tm.UndoDemoteMaster(ctx)
+	return response, err
+}
+
+func (s *server) UndoDemotePrimary(ctx context.Context, request *tabletmanagerdatapb.UndoDemotePrimaryRequest) (response *tabletmanagerdatapb.UndoDemotePrimaryResponse, err error) {
+	defer s.tm.HandleRPCPanic(ctx, "UndoDemoteMaster", request, response, true /*verbose*/, &err)
+	ctx = callinfo.GRPCCallInfo(ctx)
+	response = &tabletmanagerdatapb.UndoDemotePrimaryResponse{}
 	err = s.tm.UndoDemoteMaster(ctx)
 	return response, err
 }

diff --git a/proto/tabletmanagerdata.proto b/proto/tabletmanagerdata.proto
@@ -394,10 +394,10 @@ message DemoteMasterResponse {
   replicationdata.MasterStatus master_status = 2;
 }
 
-message UndoDemoteMasterRequest {
+message UndoDemotePrimaryRequest {
 }
 
-message UndoDemoteMasterResponse {
+message UndoDemotePrimaryResponse {
 }
 
 message ReplicaWasPromotedRequest {

diff --git a/proto/tabletmanagerservice.proto b/proto/tabletmanagerservice.proto
@@ -140,8 +140,11 @@ service TabletManager {
   // DemoteMaster tells the soon-to-be-former master it's gonna change
   rpc DemoteMaster(tabletmanagerdata.DemoteMasterRequest) returns (tabletmanagerdata.DemoteMasterResponse) {};
 
-  // UndoDemoteMaster reverts all changes made by DemoteMaster
-  rpc UndoDemoteMaster(tabletmanagerdata.UndoDemoteMasterRequest) returns (tabletmanagerdata.UndoDemoteMasterResponse) {};
+  // Deprecated, use UndoDemotePrimary instead
+  rpc UndoDemoteMaster(tabletmanagerdata.UndoDemotePrimaryRequest) returns (tabletmanagerdata.UndoDemotePrimaryResponse) {};
+
+  // UndoDemotePrimary reverts all changes made by DemotePrimary
+  rpc UndoDemotePrimary(tabletmanagerdata.UndoDemotePrimaryRequest) returns (tabletmanagerdata.UndoDemotePrimaryResponse) {};
 
   // ReplicaWasPromoted tells the remote tablet it is now the master
   rpc ReplicaWasPromoted(tabletmanagerdata.ReplicaWasPromotedRequest) returns (tabletmanagerdata.ReplicaWasPromotedResponse) {};