Skip to content

Commit dd41012

Browse files
maksimovClaude
andauthored
Fire vttablet_restore_done hook from RestoreFromBackup RPC path (#816)
The vttablet_restore_done hook was only invoked from the RestoreData (startup) path, but not from the RestoreFromBackup RPC handler. This meant restores triggered via vtctldclient never fired the hook. Signed-off-by: Stas Maksimov <smaksimov@slack-corp.com> Co-authored-by: Claude <svc-devxp-claude@slack-corp.com>
1 parent 1500add commit dd41012

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

go/vt/vttablet/tabletmanager/rpc_backup.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,9 @@ func (tm *TabletManager) RestoreFromBackup(ctx context.Context, logger logutil.L
197197
l := logutil.NewTeeLogger(logutil.NewConsoleLogger(), logger)
198198

199199
// Now we can run restore.
200-
_, err = tm.restoreDataLocked(ctx, l, 0 /* waitForBackupInterval */, true /* deleteBeforeRestore */, request, mysqlShutdownTimeout)
200+
startTime := time.Now()
201+
backupEngine, err := tm.restoreDataLocked(ctx, l, 0 /* waitForBackupInterval */, true /* deleteBeforeRestore */, request, mysqlShutdownTimeout)
202+
tm.invokeRestoreDoneHook(startTime, err, backupEngine)
201203

202204
// Re-run health check to be sure to capture any replication delay.
203205
tm.QueryServiceControl.BroadcastHealth()

0 commit comments

Comments
 (0)