Revert VM migration shutdown order change + change post_detach to post_deactivate #6260
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit 889dfa6. As there is no need to clean up the source VM earlier at all, VM_save already does the job of deactivating the source VM datapath. Signed-off-by: Vincent Liu <[email protected]>
Previously the `post_detach_hook` was run after the VDI is detached on the source VM, which is at the very end of the SXM, where the source VM is shutdown. However, the job of `post_detach_hook` is to call `Remote.receive_finalize` which will destroy the mirroring datapath. This should have been called as soon as we deactivate the datapath on the source VM, at which point the source VM will stop writing using that datapath. This commit changes `post_detach_hook` to `post_deactivate_hook` and moves its calling locations accordingly. Signed-off-by: Vincent Liu <[email protected]>
Vincent-lau
force-pushed
the
private/shul2/sxm-nodown
branch
from
5ed535d to
764ec0d
Compare
robhoes
approved these changes
Jan 29, 2025
| @@ -422,10 +422,10 @@ functor | |||
| | Vdi_automaton.Deactivate -> | |||
| Storage_migrate.pre_deactivate_hook ~dbg ~dp ~sr ~vdi ; | |||
| Impl.VDI.deactivate context ~dbg ~dp ~sr ~vdi ~vm ; | |||
| Storage_migrate.post_deactivate_hook ~sr ~vdi ~dp ; | |||
There was a problem hiding this comment.
This is SMAPIv1 only. I guess it still works for the v1 to v3 storage migration but anything migrating from SMAPIv3 would need another plan.
psafont
approved these changes
Jan 29, 2025
lindig
approved these changes
Jan 29, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There are two parts to this PR:
VM_savewould actually deactivate the source VM datapath. Thanks @edwintorok for pointing that out.post_detach_hooktopost_deactivate_hook, as this should have been called as soon as the datapath is deactivated, at which point all r/w using that datapath will be stopped.More details in the commit message.