importVM improvements: RBD support, volume format, and cluster selection by abh1sar · Pull Request #14162 · apache/cloudstack · GitHub

Description

This PR fixes 3 issues in the importVM workflow:

1. Root disk import doesn't work for RBD pools unlike data disk import

importVolume / listVolumesForImport already accept RBD. LibvirtGetVolumesOnStorageCommandWrapper has handled it all along, including building the rbd: URI for qemu-img info. But importVm importsource=shared rejects it, because the neighbouring LibvirtCheckVolumeCommandWrapper was written with a file-only pool list. An operator on Ceph can import a data disk but not a root disk.

The failure is also misleading. The agent answers "Unsupported Storage Pool", but the operator sees:

CloudRuntimeException: Disk not found or is invalid

and the VM is rolled back.

Adds StoragePoolType.RBD to the check wrapper's supported list, takes the virtual size from the disk libvirt already resolved (qemu-img cannot open a bare RBD image name), skips the QCOW2 header check for raw RBD images, and builds the rbd: URI via the existing KVMPhysicalDisk.RBDStringBuilder.

diskpath on importVm and path on importVolume are the file name on file-based pools and the image name on RBD. Both parameter descriptions now say so.

2. An imported volume records the wrong image format

importVolume and updateImportedVolume both stamped the cluster default format for the hypervisor, so a volume imported from an RBD pool was recorded QCOW2 while a natively deployed volume on the same pool is RAW. Both entry points were affected: root disks via importVm importsource=shared, and data disks via importVolume.

They now record the format the hypervisor reported for the image, from the check answer for a root disk and from the volume listed on the pool for a data disk, falling back to the hypervisor default when none is reported. This also corrects a raw image imported from a file-based pool, so it is a general correctness fix rather than an RBD-specific one.

3. The import is planned outside the pool's cluster

importKVMInstanceFromDiskImage planned with pod and cluster unset, so the planner could pick any host in the zone by capacity, even one in a cluster with no access to the pool the caller named. The volume check then ran against whichever pool that cluster does have, and the import failed with "Disk not found or is invalid" although the image was fine.
This is not RBD-specific. Reproduced on a two-cluster zone with plain NFS.

The plan now takes pod and cluster from the pool the caller passed. Both are null for a zone-wide pool, which every host can see, so that case plans exactly as before.

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)
Build/CI
Test (unit or integration test code)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

Bug Severity

BLOCKER
Critical
Major
Minor
Trivial

Screenshots (if appropriate):

How Has This Been Tested?

Deployed a VM with a root and data disk on RBD pool
Unmanage it
Import the VM
Checked the guest OS
Took volume snapshots on imported volumes
No failures or errors were observed
Verified the format of the root and data disk was raw
Verified on a two cluster setup that importVM always selects the host that has access to the storage pool.

How did you try to break this feature and the system with this change?

The CheckVolumeCommand wrapper on the KVM agent only accepted file based pools, so importing a root disk straight from Ceph failed on the agent with "Unsupported Storage Pool" and surfaced as "Disk not found or is invalid" on the management server. Add RBD to the supported pool types, take the virtual size from the disk libvirt resolved (qemu-img cannot open a bare RBD image name), skip the QCOW2 header check for raw RBD images, and build the rbd: URI when running qemu-img info, the same way LibvirtGetVolumesOnStorageCommandWrapper already does for listVolumesForImport.

importVolume and updateImportedVolume both stamped the cluster default format for the hypervisor, so a volume imported from an RBD pool was recorded as QCOW2 while a natively deployed volume on the same pool is RAW. This affected both entry points: importVm importsource=shared for a root disk, and importVolume for a data disk. Pass the format the hypervisor reported for the existing image, from the check answer for a root disk and from the volume listed on the pool for a data disk, and fall back to the hypervisor default only when no format is reported. This also corrects a raw image imported from a file based pool.

…ted pool importKVMInstanceFromDiskImage planned with the pod and cluster unset, so the planner was free to pick any host in the zone by capacity. When it picked a host in a cluster that cannot see the pool the caller named, the volume check ran against whichever pool that cluster does have, and the import failed with "Disk not found or is invalid" although the image was fine. Take the pod and cluster from the pool the caller passed, the same way importVolume already derives its host from the pool's scope

Codecov Report

❌ Patch coverage is 64.28571% with 20 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.99%. Comparing base (2e450cb) to head (78ac0f4).
⚠️ Report is 5 commits behind head on 4.22.

Files with missing lines	Patch %	Lines
...urce/wrapper/LibvirtCheckVolumeCommandWrapper.java	0.00%	14 Missing ⚠️
...stack/engine/orchestration/VolumeOrchestrator.java	25.00%	2 Missing and 1 partial ⚠️
.../apache/cloudstack/vm/UnmanagedVMsManagerImpl.java	89.28%	2 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.22   #14162      +/-   ##
============================================
+ Coverage     17.93%   17.99%   +0.05%     
- Complexity    16143    16198      +55     
============================================
  Files          5928     5930       +2     
  Lines        535174   535646     +472     
  Branches      65494    65588      +94     
============================================
+ Hits          95998    96369     +371     
- Misses       428253   428302      +49     
- Partials      10923    10975      +52

Flag	Coverage Δ
uitests	4.02% <ø> (ø)
unittests	19.06% <64.28%> (+0.05%)	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

nice improvements and fixed @abh1sar

I was thinking of reopening #13365, which is not needed in favor of this.

@blueorangutan package

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 19235

… on a raw file

@blueorangutan package

@abh1sar a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 19238

@blueorangutan test

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

[SF] Trillian test result (tid-16985)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 47797 seconds
Marvin logs: [archive removed]
Smoke tests completed. 149 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

[SF] Trillian Build Failed (tid-16987)

@blueorangutan package

@weizhouapache a [SL] Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

Packaging result [SF]: ✔️ el8 ✔️ el9 ✔️ el10 ✔️ debian ✔️ suse15. SL-JID 19248

The import wizard for local and shared storage described the disk as a QCOW2 image. An image on an RBD pool is raw, and a raw image on a file based pool can be imported as well, so the wording is wrong for both. Call it a disk image instead. Only the English strings are changed; the other locales come from Transifex.

LGTM
Tested.
1.Created a vm with data volume on Ceph PS
2. Stopped the VM and unmanaged it
3. Imported VM from the ROOT volume using path
4. Imported the DATA volume using the path
5. Attached the DATA volume on the instance.
6. Started the Instance

code lgtm

Ran the two relevant Marvin smoke tests against real Ceph/RBD storage, twice (an initial run and a rerun for confirmation):

test_vm_lifecycle_unmanage_kvm_import.py — unmanage/re-import a persistent-domain VM (both running and stopped) — 2/2 SUCCESS both times.
test_import_unmanage_volumes.py — attach/detach/unmanage/import a volume — 1/1 SUCCESS both times.

@blueorangutan test

@weizhouapache a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

@blueorangutan test

@abh1sar a [SL] Trillian-Jenkins test job (ol8 mgmt + kvm-ol8) has been kicked to run smoke tests

[SF] Trillian test result (tid-17021)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 51323 seconds
Marvin logs: [archive removed]
Smoke tests completed. 149 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

[SF] Trillian test result (tid-17023)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 49497 seconds
Marvin logs: [archive removed]
Smoke tests completed. 149 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

…ion (apache#14162) * kvm: allow importVm importsource=shared from an RBD pool The CheckVolumeCommand wrapper on the KVM agent only accepted file based pools, so importing a root disk straight from Ceph failed on the agent with "Unsupported Storage Pool" and surfaced as "Disk not found or is invalid" on the management server. Add RBD to the supported pool types, take the virtual size from the disk libvirt resolved (qemu-img cannot open a bare RBD image name), skip the QCOW2 header check for raw RBD images, and build the rbd: URI when running qemu-img info, the same way LibvirtGetVolumesOnStorageCommandWrapper already does for listVolumesForImport. * kvm: record the real image format on an imported volume importVolume and updateImportedVolume both stamped the cluster default format for the hypervisor, so a volume imported from an RBD pool was recorded as QCOW2 while a natively deployed volume on the same pool is RAW. This affected both entry points: importVm importsource=shared for a root disk, and importVolume for a data disk. Pass the format the hypervisor reported for the existing image, from the check answer for a root disk and from the volume listed on the pool for a data disk, and fall back to the hypervisor default only when no format is reported. This also corrects a raw image imported from a file based pool. * vm import: plan the instance inside the pod and cluster of the requested pool importKVMInstanceFromDiskImage planned with the pod and cluster unset, so the planner was free to pick any host in the zone by capacity. When it picked a host in a cluster that cannot see the pool the caller named, the volume check ran against whichever pool that cluster does have, and the import failed with "Disk not found or is invalid" although the image was fine. Take the pod and cluster from the pool the caller passed, the same way importVolume already derives its host from the pool's scope * verify qemu is able to read the rbd image since check can not be done on a raw file * use computed volumeDetails in success path as well. * ui: do not call the imported disk a QCOW2 image The import wizard for local and shared storage described the disk as a QCOW2 image. An image on an RBD pool is raw, and a raw image on a file based pool can be imported as well, so the wording is wrong for both. Call it a disk image instead. Only the English strings are changed; the other locales come from Transifex.

abh1sar added 3 commits September 14, 2026 10:04

boring-cyborg Bot added component:api component:kvm component:orchestration component:storage labels Sep 14, 2026

abh1sar requested review from rajujith and sureshanaparti September 14, 2026 06:15

weizhouapache reviewed Sep 14, 2026

View reviewed changes

Comment thread ...rc/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapper.java Resolved

verify qemu is able to read the rbd image since check can not be done…

8f49d1a

… on a raw file

weizhouapache reviewed Sep 15, 2026

View reviewed changes

Comment thread ...rc/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVolumeCommandWrapper.java Resolved

weizhouapache self-assigned this Sep 15, 2026

weizhouapache added the component:ceph label Sep 15, 2026

use computed volumeDetails in success path as well.

0b898ad

boring-cyborg Bot added the component:UI label Sep 17, 2026

rajujith approved these changes Sep 18, 2026

View reviewed changes

weizhouapache approved these changes Sep 18, 2026

View reviewed changes

weizhouapache added the status:ready-for-merge label Sep 18, 2026

weizhouapache added this to the 4.22.2 milestone Sep 18, 2026

weizhouapache merged commit ac8d69c into apache:4.22 Sep 19, 2026
25 of 26 checks passed

DaanHoogland deleted the importvm-impr branch September 24, 2026 10:42

importVM improvements: RBD support, volume format, and cluster selection by abh1sar · Pull Request #14162 · apache/cloudstack · GitHub

Repository navigation

importVM improvements: RBD support, volume format, and cluster selection - #14162

importVM improvements: RBD support, volume format, and cluster selection#14162weizhouapache merged 6 commits intoapache:4.22apache/cloudstack:4.22from shapeblue:importvm-imprshapeblue/cloudstack:importvm-imprCopy head branch name to clipboard

Conversation

abh1sar commented Sep 14, 2026

Description

1. Root disk import doesn't work for RBD pools unlike data disk import

2. An imported volume records the wrong image format

3. The import is planned outside the pool's cluster

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?

Uh oh!

codecov Bot commented Sep 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Sep 14, 2026

Uh oh!

weizhouapache commented Sep 14, 2026

Uh oh!

blueorangutan commented Sep 14, 2026

Uh oh!

Uh oh!

blueorangutan commented Sep 14, 2026

Uh oh!

abh1sar commented Sep 14, 2026

Uh oh!

blueorangutan commented Sep 14, 2026

Uh oh!

blueorangutan commented Sep 14, 2026

Uh oh!

weizhouapache commented Sep 14, 2026

Uh oh!

blueorangutan commented Sep 14, 2026

Uh oh!

blueorangutan commented Sep 15, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blueorangutan commented Sep 15, 2026

Uh oh!

Uh oh!

weizhouapache commented Sep 15, 2026

Uh oh!

blueorangutan commented Sep 15, 2026

Uh oh!

blueorangutan commented Sep 15, 2026

Uh oh!

rajujith left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache commented Sep 18, 2026

Uh oh!

weizhouapache commented Sep 18, 2026

Uh oh!

blueorangutan commented Sep 18, 2026

Uh oh!

abh1sar commented Sep 18, 2026

Uh oh!

blueorangutan commented Sep 18, 2026

Uh oh!

blueorangutan commented Sep 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

blueorangutan commented Sep 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

importVM improvements: RBD support, volume format, and cluster selection#14162
weizhouapache merged 6 commits into
apache:4.22from
shapeblue:importvm-impr

codecov Bot commented Sep 14, 2026 •
edited
Loading

blueorangutan commented Sep 15, 2026 •
edited
Loading

blueorangutan commented Sep 18, 2026 •
edited
Loading

blueorangutan commented Sep 18, 2026 •
edited
Loading