Merge remote-tracking branch 'rvrangel/mysqlshell-backup' into floren…

…t-mysqlshell-backup-custom-docker-build

Signed-off-by: Florent Poinsard <florent.poinsard@outlook.fr>

go/vt/mysqlctl/backup.go

@@ -447,17 +447,19 @@ func Restore(ctx context.Context, params RestoreParams) (*BackupManifest, error)
  return nil, err
  }
 
- // mysqld needs to be running in order for mysql_upgrade to work.
- // If we've just restored from a backup from previous MySQL version then mysqld
- // may fail to start due to a different structure of mysql.* tables. The flag
- // --skip-grant-tables ensures that these tables are not read until mysql_upgrade
- // is executed. And since with --skip-grant-tables anyone can connect to MySQL
- // without password, we are passing --skip-networking to greatly reduce the set
- // of those who can connect.
- params.Logger.Infof("Restore: starting mysqld for mysql_upgrade")
- // Note Start will use dba user for waiting, this is fine, it will be allowed.
- if err := params.Mysqld.Start(context.Background(), params.Cnf, "--skip-grant-tables", "--skip-networking"); err != nil {
- return nil, err
+ if re.ShouldStartMySQLAfterRestore() { // all engines except mysqlshell since MySQL is always running there
+ // mysqld needs to be running in order for mysql_upgrade to work.
+ // If we've just restored from a backup from previous MySQL version then mysqld
+ // may fail to start due to a different structure of mysql.* tables. The flag
+ // --skip-grant-tables ensures that these tables are not read until mysql_upgrade
+ // is executed. And since with --skip-grant-tables anyone can connect to MySQL
+ // without password, we are passing --skip-networking to greatly reduce the set
+ // of those who can connect.
+ params.Logger.Infof("Restore: starting mysqld for mysql_upgrade")
+ // Note Start will use dba user for waiting, this is fine, it will be allowed.
+ if err := params.Mysqld.Start(context.Background(), params.Cnf, "--skip-grant-tables", "--skip-networking"); err != nil {
+ return nil, err
+ }
  }
 
  params.Logger.Infof("Restore: running mysql_upgrade")

go/vt/mysqlctl/backupengine.go

@@ -179,6 +179,7 @@ func (p *RestoreParams) IsIncrementalRecovery() bool {
 // Returns the manifest of a backup if successful, otherwise returns an error
 type RestoreEngine interface {
  ExecuteRestore(ctx context.Context, params RestoreParams, bh backupstorage.BackupHandle) (*BackupManifest, error)
+ ShouldStartMySQLAfterRestore() bool
 }
 
 // BackupRestoreEngine is a combination of BackupEngine and RestoreEngine.

go/vt/mysqlctl/builtinbackupengine.go

@@ -1185,6 +1185,11 @@ func (be *BuiltinBackupEngine) ShouldDrainForBackup(req *tabletmanagerdatapb.Bac
  return true
 }
 
+// ShouldStartMySQLAfterRestore signifies if this backup engine needs to restart MySQL once the restore is completed.
+func (be *BuiltinBackupEngine) ShouldStartMySQLAfterRestore() bool {
+ return true
+}
+
 func getPrimaryPosition(ctx context.Context, tmc tmclient.TabletManagerClient, ts *topo.Server, keyspace, shard string) (replication.Position, error) {
  si, err := ts.GetShard(ctx, keyspace, shard)
  if err != nil {

go/vt/mysqlctl/fakebackupengine.go

@@ -91,3 +91,7 @@ func (be *FakeBackupEngine) ShouldDrainForBackup(req *tabletmanagerdatapb.Backup
  be.ShouldDrainForBackupCalls = be.ShouldDrainForBackupCalls + 1
  return be.ShouldDrainForBackupReturn
 }
+
+func (be *FakeBackupEngine) ShouldStartMySQLAfterRestore() bool {
+ return true
+}

go/vt/mysqlctl/mysqlshellbackupengine.go

@@ -381,6 +381,12 @@ func (be *MySQLShellBackupEngine) ShouldDrainForBackup(req *tabletmanagerdatapb.
  return mysqlShellBackupShouldDrain
 }
 
+// ShouldStartMySQLAfterRestore signifies if this backup engine needs to restart MySQL once the restore is completed.
+// Since MySQL Shell operates on a live MySQL instance, there is no need to start it once the restore is completed
+func (be *MySQLShellBackupEngine) ShouldStartMySQLAfterRestore() bool {
+ return false
+}
+
 func (be *MySQLShellBackupEngine) backupPreCheck(location string) error {
  if mysqlShellBackupLocation == "" {
  return fmt.Errorf("%w: no backup location set via --mysql-shell-backup-location", MySQLShellPreCheckError)

go/vt/mysqlctl/xtrabackupengine.go

@@ -942,6 +942,11 @@ func (be *XtrabackupEngine) ShouldDrainForBackup(req *tabletmanagerdatapb.Backup
  return false
 }
 
+// ShouldStartMySQLAfterRestore signifies if this backup engine needs to restart MySQL once the restore is completed.
+func (be *XtrabackupEngine) ShouldStartMySQLAfterRestore() bool {
+ return true
+}
+
 func init() {
  BackupRestoreEngineMap[xtrabackupEngineName] = &XtrabackupEngine{}
 }