[VMware to KVM] Cleanup leftover migrated volumes in case of migration failures#13151
Open
nvazquez wants to merge 2 commits into
Open
[VMware to KVM] Cleanup leftover migrated volumes in case of migration failures#13151nvazquez wants to merge 2 commits into
nvazquez wants to merge 2 commits into
Conversation
nvazquez
requested review from
DaanHoogland,
NuxRo,
Pearl1594,
harikrishna-patnala,
kiranchavala,
sureshanaparti,
vishesh92 and
weizhouapache
Contributor
Author
|
@blueorangutan package |
|
@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress. |
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## main #13151 +/- ##
============================================
- Coverage 18.09% 18.08% -0.01%
+ Complexity 16723 16721 -2
============================================
Files 6037 6040 +3
Lines 542580 542643 +63
Branches 66427 66432 +5
============================================
- Hits 98155 98137 -18
- Misses 433399 433481 +82
+ Partials 11026 11025 -1
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Harness. 🚀 New features to boost your workflow:
|
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17829 |
Contributor
Author
|
@blueorangutan test |
|
@nvazquez a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-16076)
|
Contributor
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Adds a best-effort cleanup path for temporary converted volumes when VMware→KVM import fails, and refactors KVM conversion wrappers to share common helper logic.
Changes:
- Trigger cleanup of temporary converted disks on import failures/timeouts.
- Introduce
CleanupConvertedInstanceDisksCommandand a corresponding KVM resource wrapper to delete leftover conversion artifacts. - Refactor
LibvirtImportConvertedInstanceCommandWrapperto reuse a new sharedLibvirtBaseConvertCommandWrapper.
Reviewed changes
Copilot reviewed 6 out of 6 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
| server/src/main/java/org/apache/cloudstack/vm/UnmanagedVMsManagerImpl.java | Sends a new cleanup command to remove temporary converted disks when import fails. |
| plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtImportConvertedInstanceCommandWrapper.java | Refactors wrapper to inherit shared convert/import helpers and updates cleanup call signature. |
| plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCleanupConvertedInstanceDisksCommandWrapper.java | Adds KVM-side handler that locates and deletes temporary conversion disks (and XML when present). |
| plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtBaseConvertCommandWrapper.java | Introduces shared helper methods previously embedded in the import wrapper. |
| core/src/main/java/com/cloud/agent/api/CleanupConvertedInstanceDisksCommand.java | Adds agent command to request cleanup of converted disks by store + prefix. |
| core/src/main/java/com/cloud/agent/api/CleanupConvertedInstanceDisksAnswer.java | Adds a new Answer type for the cleanup command (currently empty). |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
|
@blueorangutan package |
|
@nvazquez a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress. |
harikrishna-patnala
approved these changes
May 13, 2026
harikrishna-patnala
left a comment
harikrishna-patnala
left a comment
Member
There was a problem hiding this comment.
code LGTM. @nvazquez please check if we can add some unit tests here.
|
Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 17841 |
Contributor
|
@blueorangutan test |
|
@DaanHoogland a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian Build Failed (tid-16113) |
|
[SF] Trillian test result (tid-16155)
|
|
[SF] Trillian Build Failed (tid-16175) |
Collaborator
|
@blueorangutan test |
|
@RosiKyu a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-16334)
|
|
|
||
| import com.cloud.agent.api.to.DataStoreTO; | ||
|
|
||
| public class CleanupConvertedInstanceDisksCommand extends Command { |
Contributor
There was a problem hiding this comment.
can you add a javadoc with the intent of this command? I suppose it cleans disks for a non existing vm with name vmVolumesPrefix, but would be nice to make that explicit
Comment on lines
+2245
to
+2260
| if (cleanupConvertedDisks) { | ||
| logger.debug("Cleaning up the converted disks for the VM {} through " + | ||
| "the conversion host {}", sourceVM, convertHost.getName()); | ||
| CleanupConvertedInstanceDisksCommand cleanupCommand = | ||
| new CleanupConvertedInstanceDisksCommand(temporaryConvertLocation, convertedDisksPrefix); | ||
| try { | ||
| Answer cleanupAnswer = agentManager.send(convertHost.getId(), cleanupCommand); | ||
| if (!cleanupAnswer.getResult()) { | ||
| logger.warn("Failed to cleanup the converted disks for the VM {} through " + | ||
| "the conversion host {}: {}", sourceVM, convertHost.getName(), cleanupAnswer.getDetails()); | ||
| } | ||
| } catch (AgentUnavailableException | OperationTimedoutException e) { | ||
| logger.error("Error cleaning up converted disks for VM {} through the conversion host {}", | ||
| sourceVM, convertHost.getName(), e); | ||
| } | ||
| } |
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
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.
Description
This PR includes a cleanup mechanism for migrated volumes which are leftover in case the VMware to KVM migrations have failed unexpectedly.
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
How did you try to break this feature and the system with this change?