field rename

Signed-off-by: Tim Vaillancourt <[email protected]>

go/vt/vtctl/grpcvtctldserver/server.go

@@ -1233,7 +1233,7 @@ func (s *VtctldServer) EmergencyReparentShard(ctx context.Context, req *vtctldat
 			WaitReplicasTimeout:       waitReplicasTimeout,
 			WaitAllTablets:            req.WaitForAllTablets,
 			PreventCrossCellPromotion: req.PreventCrossCellPromotion,
-			CurrentPrimaryAlias:       req.CurrentPrimary,
+			ExpectedPrimaryAlias:      req.ExpectedPrimary,
 		},
 	)
 

go/vt/vtctl/reparentutil/emergency_reparenter.go

@@ -60,7 +60,7 @@ type EmergencyReparentOptions struct {
 	WaitAllTablets            bool
 	WaitReplicasTimeout       time.Duration
 	PreventCrossCellPromotion bool
-	CurrentPrimaryAlias       *topodatapb.TabletAlias
+	ExpectedPrimaryAlias      *topodatapb.TabletAlias
 
 	// Private options managed internally. We use value passing to avoid leaking
 	// these details back out.
@@ -166,8 +166,8 @@ func (erp *EmergencyReparenter) reparentShardLocked(ctx context.Context, ev *eve
 	}
 	ev.ShardInfo = *shardInfo
 
-	if opts.CurrentPrimaryAlias != nil && !topoproto.TabletAliasEqual(opts.CurrentPrimaryAlias, shardInfo.PrimaryAlias) {
-		return vterrors.Errorf(vtrpc.Code_FAILED_PRECONDITION, "current primary %q is not equal to %q", shardInfo.PrimaryAlias, opts.CurrentPrimaryAlias)
+	if opts.ExpectedPrimaryAlias != nil && !topoproto.TabletAliasEqual(opts.ExpectedPrimaryAlias, shardInfo.PrimaryAlias) {
+		return vterrors.Errorf(vtrpc.Code_FAILED_PRECONDITION, "primary %s is not equal to expected alias %s", shardInfo.PrimaryAlias, opts.ExpectedPrimaryAlias)
 	}
 
 	keyspaceDurability, err := erp.ts.GetKeyspaceDurability(ctx, keyspace)

proto/vtctldata.proto

@@ -680,8 +680,9 @@ message EmergencyReparentShardRequest {
   // WaitForAllTablets makes ERS wait for a response from all the tablets before proceeding.
   // Useful when all the tablets are up and reachable.
   bool wait_for_all_tablets = 7;
-  // CurrentPrimary is the optional alias we require to be the current primary.
-  topodata.TabletAlias current_primary = 8;
+  // ExpectedPrimary is the optional alias we expect to be the current primary in order for
+  // the reparent request to succeed.
+  topodata.TabletAlias expected_primary = 8;
 }
 
 message EmergencyReparentShardResponse {