diff --git a/go/test/endtoend/backup/vtctlbackup/backup_utils.go b/go/test/endtoend/backup/vtctlbackup/backup_utils.go index cdf39408be3..492701345ee 100644 --- a/go/test/endtoend/backup/vtctlbackup/backup_utils.go +++ b/go/test/endtoend/backup/vtctlbackup/backup_utils.go @@ -132,7 +132,7 @@ func LaunchCluster(setupType int, streamMode string, stripes int, cDetails *Comp return 1, err } newInitDBFile = path.Join(localCluster.TmpDirectory, "init_db_with_passwords.sql") - err = os.WriteFile(newInitDBFile, []byte(sql), 0666) + err = os.WriteFile(newInitDBFile, []byte(sql), 0o666) if err != nil { return 1, err } @@ -561,10 +561,10 @@ func primaryBackup(t *testing.T) { _, err = primary.VttabletProcess.QueryTablet("DROP TABLE vt_insert_test", keyspaceName, true) require.NoError(t, err) + + restartPrimaryAndReplica(t) } -// Test a primary and replica from the same backup. -// // Check that a replica and primary both restored from the same backup // can replicate successfully. func primaryReplicaSameBackup(t *testing.T) { diff --git a/go/vt/vttablet/grpctmclient/client.go b/go/vt/vttablet/grpctmclient/client.go index 8fe25bf20f5..143dc4798ff 100644 --- a/go/vt/vttablet/grpctmclient/client.go +++ b/go/vt/vttablet/grpctmclient/client.go @@ -671,7 +671,7 @@ func (client *Client) ExecuteFetchAsDba(ctx context.Context, tablet *topodatapb. DbName: topoproto.TabletDbName(tablet), MaxRows: req.MaxRows, DisableBinlogs: req.DisableBinlogs, - ReloadSchema: req.DisableBinlogs, + ReloadSchema: req.ReloadSchema, DisableForeignKeyChecks: req.DisableForeignKeyChecks, }) if err != nil { @@ -707,7 +707,7 @@ func (client *Client) ExecuteMultiFetchAsDba(ctx context.Context, tablet *topoda DbName: topoproto.TabletDbName(tablet), MaxRows: req.MaxRows, DisableBinlogs: req.DisableBinlogs, - ReloadSchema: req.DisableBinlogs, + ReloadSchema: req.ReloadSchema, DisableForeignKeyChecks: req.DisableForeignKeyChecks, }) if err != nil {