CA-380789: Not get power_state from snapshots with suspend VDIs #5148
Conversation
This file contains hidden or 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 commit is to fix an issue which was introduced by 3d039f3. In VM migration, the suspend_vdis will be get from snapshots the power_state of which is `Suspended. The individual snapshots are represented as VM records in XAPI as well. They are different with the base VM record. This commit reverts this part to the logic prior to 3d039f3. Signed-off-by: Ming Lu <[email protected]>
psafont
reviewed
Aug 14, 2023
Comment on lines
1243
to
+1244
| (fun acc vm -> | ||
| if power_state = `Suspended then | ||
| if Db.VM.get_power_state ~__context ~self:vm = `Suspended then |
There was a problem hiding this comment.
It's clear how reverting fixes the issue, maybe rename the binding to make sure it can't be mistaken again?
Suggested change
| (fun acc vm -> | |
| if power_state = `Suspended then | |
| if Db.VM.get_power_state ~__context ~self:vm = `Suspended then | |
| (fun acc vm_or_snapshot -> | |
| let power_state = Db.VM.get_power_state ~__context ~self:vm_or_snapshot then | |
| if power_state = `Suspended then |
There was a problem hiding this comment.
Let's minimize the changes at this stage :)
psafont
approved these changes
Aug 14, 2023
lindig
approved these changes
Aug 14, 2023
github-merge-queue bot
pushed a commit
that referenced
this pull request
Dec 13, 2024
…CPU check to the target host (#6175) Rebased the work from 2023 merged in #5111 and #5132, that caused issues and was partially fixed in #5148, but was completely reverted in #5147. I've integrated the fix from #5148 and additionally the fix suggested by @minglumlu in CA-380715 that was not merged at the time due to time constraints. This series passed the tests that were originally failing: sxm-unres (Job ID 4177739), vGPUSXMM60CrossPool (4177750), and also passed the Ring3 BST+BVT (209341). I can run more migration tests if needed - I've heard @Vincent-lau has requested for these to be separated into its own suite instead of being only in Core and Distribution regression tests.
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.
This commit is to fix an issue which was introduced by 3d039f3. In VM migration, the suspend_vdis will be get from snapshots the power_state of which is `Suspended. The individual snapshots are represented as VM records in XAPI as well. They are different with the base VM record.
This commit reverts this part to the logic prior to 3d039f3.