PBM-1574 PBM restore with -w doesn't wait till the end of restore #1169
Conversation
… into PBM-1574-restore-with-w-doesnt-wait-till-the-end
There was a problem hiding this comment.
Pull Request Overview
This PR fixes an issue where the --wait flag in PBM restore was not waiting for the complete restoration process to finish. The main change moves the dumpMeta call into the defer block to ensure it runs after r.close() completes, since r.close() can take significant time.
- Moved
dumpMetacall from the main function body into the defer block - Added proper error handling for the close operation
- Ensures the restore metadata is written only after all cleanup operations complete
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| err = errors.Wrap(err, "snapshot close") | ||
| cerr := r.close(noerr, progress) | ||
|
|
||
| if cerr != nil && err == nil { |
There was a problem hiding this comment.
[nitpick] The error handling logic could be simplified. Consider using a more straightforward approach where you preserve the original error if it exists, otherwise use the close error.
| if cerr != nil && err == nil { | |
| if err == nil && cerr != nil { |
Copilot uses AI. Check for mistakes.
| err = errors.Wrap(cerr, "snapshot close") | ||
| } | ||
|
|
||
| if noerr && err == nil { |
There was a problem hiding this comment.
The condition noerr && err == nil is redundant since noerr is defined as err == nil. You can simplify this to just if noerr {.
| if noerr && err == nil { | |
| if err == nil { |
Copilot uses AI. Check for mistakes.
The
--waitflag is supported, but it doesn't wait long enough.This PR moves the
dumpMetacall into the defer block. Previously,dumpMeta()was called beforer.close()completed. Sincer.close()can take time, the restore could finish early from the CLI's perspective.