PlannedReparent fixes

go/vt/mysqlctl/fakemysqldaemon/fakemysqldaemon.go

@@ -104,8 +104,11 @@ type FakeMysqlDaemon struct {
 	// same it returns nil, if different it returns an error
 	WaitMasterPosition mysql.Position
 
-	// PromoteSlaveResult is returned by PromoteSlave
-	PromoteSlaveResult mysql.Position
+	// PromoteResult is returned by Promote
+	PromoteResult mysql.Position
+
+	// PromoteError is used by Promote
+	PromoteError error
 
 	// SchemaFunc provides the return value for GetSchema.
 	// If not defined, the "Schema" field will be used instead, see below.
@@ -348,9 +351,12 @@ func (fmd *FakeMysqlDaemon) WaitMasterPos(_ context.Context, pos mysql.Position)
 	return fmt.Errorf("wrong input for WaitMasterPos: expected %v got %v", fmd.WaitMasterPosition, pos)
 }
 
-// PromoteSlave is part of the MysqlDaemon interface
-func (fmd *FakeMysqlDaemon) PromoteSlave(hookExtraEnv map[string]string) (mysql.Position, error) {
-	return fmd.PromoteSlaveResult, nil
+// Promote is part of the MysqlDaemon interface
+func (fmd *FakeMysqlDaemon) Promote(hookExtraEnv map[string]string) (mysql.Position, error) {
+	if fmd.PromoteError != nil {
+		return mysql.Position{}, fmd.PromoteError
+	}
+	return fmd.PromoteResult, nil
 }
 
 // ExecuteSuperQueryList is part of the MysqlDaemon interface

go/vt/mysqlctl/mysql_daemon.go

@@ -65,10 +65,9 @@ type MysqlDaemon interface {
 
 	WaitMasterPos(context.Context, mysql.Position) error
 
-	// PromoteSlave makes the slave the new master. It will not change
+	// Promote makes the current server master. It will not change
 	// the read_only state of the server.
-	PromoteSlave(map[string]string) (mysql.Position, error)
-
+	Promote(map[string]string) (mysql.Position, error)
 	// Schema related methods
 	GetSchema(dbName string, tables, excludeTables []string, includeViews bool) (*tabletmanagerdatapb.SchemaDefinition, error)
 	GetColumns(dbName, table string) ([]*querypb.Field, []string, error)

go/vt/mysqlctl/reparent.go

@@ -97,8 +97,8 @@ func (mysqld *Mysqld) DemoteMaster() (rp mysql.Position, err error) {
 	return mysqld.MasterPosition()
 }
 
-// PromoteSlave will promote a slave to be the new master.
-func (mysqld *Mysqld) PromoteSlave(hookExtraEnv map[string]string) (mysql.Position, error) {
+// Promote will promote this server to be the new master.
+func (mysqld *Mysqld) Promote(hookExtraEnv map[string]string) (mysql.Position, error) {
 	ctx := context.TODO()
 	conn, err := getPoolReconnect(ctx, mysqld.dbaPool)
 	if err != nil {