Skip to content

Commit fce25c8

Browse files
committed
fix apis
1 parent a1dfaa6 commit fce25c8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

go/vt/mysqlctl/mysqlshellbackupengine.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func (be *MySQLShellBackupEngine) ExecuteBackup(ctx context.Context, params Back
152152
}
153153
lockAcquired := time.Now() // we will report how long we hold the lock for
154154

155-
posBeforeBackup, err := params.Mysqld.PrimaryPosition(ctx)
155+
posBeforeBackup, err := params.Mysqld.PrimaryPosition()
156156
if err != nil {
157157
return BackupUnusable, vterrors.Wrap(err, "failed to fetch position")
158158
}
@@ -255,20 +255,20 @@ func (be *MySQLShellBackupEngine) ExecuteRestore(ctx context.Context, params Res
255255
}
256256

257257
// make sure semi-sync is disabled, otherwise we will wait forever for acknowledgements
258-
err = params.Mysqld.SetSemiSyncEnabled(ctx, false, false)
258+
err = params.Mysqld.SetSemiSyncEnabled(false, false)
259259
if err != nil {
260260
return nil, vterrors.Wrap(err, "disable semi-sync failed")
261261
}
262262

263263
params.Logger.Infof("restoring on an existing tablet, so dropping database %q", params.DbName)
264264

265-
readonly, err := params.Mysqld.IsSuperReadOnly(ctx)
265+
readonly, err := params.Mysqld.IsSuperReadOnly()
266266
if err != nil {
267267
return nil, vterrors.Wrap(err, fmt.Sprintf("checking if mysqld has super_read_only=enable: %v", err))
268268
}
269269

270270
if readonly {
271-
resetFunc, err := params.Mysqld.SetSuperReadOnly(ctx, false)
271+
resetFunc, err := params.Mysqld.SetSuperReadOnly(false)
272272
if err != nil {
273273
return nil, vterrors.Wrap(err, fmt.Sprintf("unable to disable super-read-only: %v", err))
274274
}
@@ -466,15 +466,15 @@ func (be *MySQLShellBackupEngine) restorePreCheck(ctx context.Context, params Re
466466
}
467467

468468
func (be *MySQLShellBackupEngine) handleSuperReadOnly(ctx context.Context, params RestoreParams) (func(), error) {
469-
readonly, err := params.Mysqld.IsSuperReadOnly(ctx)
469+
readonly, err := params.Mysqld.IsSuperReadOnly()
470470
if err != nil {
471471
return nil, vterrors.Wrap(err, fmt.Sprintf("checking if mysqld has super_read_only=enable: %v", err))
472472
}
473473

474474
params.Logger.Infof("Is Super Read Only: %v", readonly)
475475

476476
if readonly {
477-
resetFunc, err := params.Mysqld.SetSuperReadOnly(ctx, false)
477+
resetFunc, err := params.Mysqld.SetSuperReadOnly(false)
478478
if err != nil {
479479
return nil, vterrors.Wrap(err, fmt.Sprintf("unable to disable super-read-only: %v", err))
480480
}

0 commit comments

Comments
 (0)