CLVM enhancements and fixes by Pearl1594 · Pull Request #12617 · apache/cloudstack

Pearl1594 · 2026-02-09T19:47:40Z

Description

This PR enhances the existing CLVM implementation which was based on the deprecated CLVM technology which was based on corosync/pacemaker. With RHEL 7 having reached EOL, CLVM seems to be broken. CLVM supports RAW volumes on LVM , where as CLVM_NG support QCOW2 on LVM.

Further details: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Modernized+CLVM%3A+Enhancements+and+CLVM_NG+support

NOTE: On testing - it was identified that incremental snapshots for clvm-ng do not work as expected. As of now it's been removed from scope. So, CLVM and CLVM_NG would only support full snapshots.

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

Screenshots (if appropriate):

How Has This Been Tested?

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

codecov · 2026-02-09T20:01:42Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 3.68%. Comparing base (d3e1976) to head (df61d6f).
⚠️ Report is 15 commits behind head on main.

❗ There is a different number of reports uploaded between BASE (d3e1976) and HEAD (df61d6f). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (d3e1976) HEAD (df61d6f)

unittests 1 0

Additional details and impacted files

@@              Coverage Diff              @@
##               main   #12617       +/-   ##
=============================================
- Coverage     17.90%    3.68%   -14.23%     
=============================================
  Files          5938      454     -5484     
  Lines        532864    38798   -494066     
  Branches      65192     7151    -58041     
=============================================
- Hits          95392     1428    -93964     
+ Misses       426793    37183   -389610     
+ Partials      10679      187    -10492

Flag	Coverage Δ
uitests	`3.67% <ø> (+<0.01%)`	⬆️
unittests	`?`

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

☔ View full report in Codecov by Sentry.
📢 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.

…of running vm

Pearl1594 · 2026-02-11T19:43:29Z

@blueorangutan package

blueorangutan · 2026-02-11T19:44:04Z

@Pearl1594 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.

blueorangutan · 2026-02-11T20:28:42Z

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

codecov · 2026-02-17T15:24:41Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 3.53%. Comparing base (6bc83a3) to head (729f79a).

❗ There is a different number of reports uploaded between BASE (6bc83a3) and HEAD (729f79a). Click for more details.

HEAD has 1 upload less than BASE

Flag BASE (6bc83a3) HEAD (729f79a)

unittests 1 0

Additional details and impacted files

@@              Coverage Diff              @@
##               main   #12617       +/-   ##
=============================================
- Coverage     18.75%    3.53%   -15.23%     
=============================================
  Files          6160      464     -5696     
  Lines        552578    40203   -512375     
  Branches      67348     7563    -59785     
=============================================
- Hits         103660     1421   -102239     
+ Misses       437512    38592   -398920     
+ Partials      11406      190    -11216

Flag	Coverage Δ
uitests	`3.53% <ø> (-0.01%)`	⬇️
unittests	`?`

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.

Pearl1594 · 2026-02-18T16:33:12Z

@blueorangutan package

blueorangutan · 2026-02-18T16:40:04Z

@Pearl1594 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.

blueorangutan · 2026-02-18T17:32:01Z

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

Pearl1594 · 2026-02-18T20:23:11Z

@blueorangutan package

blueorangutan · 2026-02-18T20:24:04Z

@Pearl1594 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.

blueorangutan · 2026-02-18T21:16:21Z

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

…ached volumes

…-enhancements

Pearl1594 · 2026-06-08T18:16:33Z

@blueorangutan package

blueorangutan · 2026-06-08T18:18:05Z

@Pearl1594 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.

blueorangutan · 2026-06-08T19:11:54Z

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

Pearl1594 · 2026-06-08T19:26:05Z

@blueorangutan test

blueorangutan · 2026-06-08T19:28:04Z

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

…clvm pool type

Pearl1594 · 2026-06-08T21:56:11Z

@blueorangutan package

blueorangutan · 2026-06-08T21:58:04Z

@Pearl1594 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.

blueorangutan · 2026-06-08T22:42:50Z

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

Pearl1594 · 2026-06-08T22:44:42Z

@blueorangutan test

blueorangutan · 2026-06-08T22:46:03Z

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

sonarqubecloud · 2026-06-08T22:54:06Z

Quality Gate failed

Failed conditions
1 Security Hotspot
34.0% Coverage on New Code (required ≥ 40%)

See analysis details on SonarQube Cloud

JoaoJandre

I was only able to review half the files. I will do the rest later.
Also, could you point to a documentation somewhere on how to setup a CLVM_NG storage to add it to ACS? I was not able to find it online

JoaoJandre · 2026-06-09T16:42:04Z

+            }
+        }
+
+        updateClvmLockHostForVmVolumes(vm.getId(), dstHostId);


If the result is false, or null, we still update the lock? How do we know if this update will be correct?
If the host does not execute the command (the command queue is full and the command times out, or the host is restarted) we will update the lock metadata to point to the wrong host, correct?

if it does, in the next re-try it will get corrected.

JoaoJandre · 2026-06-09T17:35:43Z

+            return new MigrateCommand.MigrateDiskInfo(srcVolumeInfo.getPath(),
+                    MigrateCommand.MigrateDiskInfo.DiskType.FILE,
+                    MigrateCommand.MigrateDiskInfo.DriverType.QCOW2,
+                    MigrateCommand.MigrateDiskInfo.Source.FILE,
+                    destPath,
+                    backingPath);


Is this a style change only? Is it needed?

this was just cosmetic for better readability.

JoaoJandre · 2026-06-09T17:43:32Z

+                    String details = preMigAnswer != null ? preMigAnswer.getDetails() : "null answer returned";
+                    logger.warn("PreMigrationCommand failed for CLVM/CLVM_NG VM [{}] on source host [{}]: {}. Migration will continue but may fail if volumes are exclusively locked.", vmTO.getName(), srcHost.getId(), details);


Shouldn't we abort the migration in this case?
If we continue and it does not work, it could lead to problems in the VM, no?

No - if it fails, it will behave like any VM migration failure. The source VM / volume goes back to original state.

Pearl1594 · 2026-06-09T18:02:38Z

I was only able to review half the files. I will do the rest later. Also, could you point to a documentation somewhere on how to setup a CLVM_NG storage to add it to ACS? I was not able to find it online

It can be found at: apache/cloudstack-documentation#637

Pearl1594 · 2026-06-09T19:29:58Z

@blueorangutan package

blueorangutan · 2026-06-09T19:32:04Z

@Pearl1594 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.

winterhazel · 2026-06-09T20:12:00Z

+        // Check if CLVM lock transfer is needed (even if moveVolumeNeeded is false)
+        // This handles the case where the volume is already on the correct storage pool
+        // but the VM is running on a different host, requiring only a lock transfer
+        boolean isClvmLockTransferNeeded = !moveVolumeNeeded &&
+                isClvmLockTransferRequired(newVolumeOnPrimaryStorage, existingVolumeOfVm, vm);
+
+        if (isClvmLockTransferNeeded) {
+            // CLVM lock transfer - no data copy, no pool change needed
+            newVolumeOnPrimaryStorage = executeLightweightLockMigration(
+                    newVolumeOnPrimaryStorage, vm, existingVolumeOfVm,
+                    "CLVM lock transfer", "same pool to different host");
+        } else if (moveVolumeNeeded) {
            PrimaryDataStoreInfo primaryStore = (PrimaryDataStoreInfo)newVolumeOnPrimaryStorage.getDataStore();
            if (primaryStore.isLocal()) {
                throw new CloudRuntimeException(
                        "Failed to attach local data volume " + volumeToAttach.getName() + " to VM " + vm.getDisplayName() + " as migration of local data volume is not allowed");
            }
-            StoragePoolVO vmRootVolumePool = _storagePoolDao.findById(existingVolumeOfVm.getPoolId());

-            try {
-                HypervisorType volumeToAttachHyperType = _volsDao.getHypervisorType(volumeToAttach.getId());
-                newVolumeOnPrimaryStorage = _volumeMgr.moveVolume(newVolumeOnPrimaryStorage, vmRootVolumePool.getDataCenterId(), vmRootVolumePool.getPodId(), vmRootVolumePool.getClusterId(),
-                        volumeToAttachHyperType);
-            } catch (ConcurrentOperationException | StorageUnavailableException e) {
-                logger.debug("move volume failed", e);
-                throw new CloudRuntimeException("move volume failed", e);
+            boolean isClvmLightweightMigration = isClvmLightweightMigrationNeeded(
+                    newVolumeOnPrimaryStorage, existingVolumeOfVm, vm);
+
+            if (isClvmLightweightMigration) {
+                newVolumeOnPrimaryStorage = executeLightweightLockMigration(
+                        newVolumeOnPrimaryStorage, vm, existingVolumeOfVm,
+                        "CLVM lightweight migration", "different pools, same VG");
+            } else {
+                StoragePoolVO vmRootVolumePool = _storagePoolDao.findById(existingVolumeOfVm.getPoolId());
+
+                try {
+                    HypervisorType volumeToAttachHyperType = _volsDao.getHypervisorType(volumeToAttach.getId());
+                    newVolumeOnPrimaryStorage = _volumeMgr.moveVolume(newVolumeOnPrimaryStorage, vmRootVolumePool.getDataCenterId(), vmRootVolumePool.getPodId(), vmRootVolumePool.getClusterId(),
+                            volumeToAttachHyperType);
+                } catch (ConcurrentOperationException | StorageUnavailableException e) {
+                    logger.debug("move volume failed", e);
+                    throw new CloudRuntimeException("move volume failed", e);
+                }
            }


Can this volume move section be extracted to a separate method to reduce indentation?

Would it be ok if I addressed this in another PR - with other enhancements that are yet to come.

blueorangutan · 2026-06-09T20:18:25Z

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

boring-cyborg Bot added component:kvm component:storage labels Feb 9, 2026

CLVM enhancements and fixes

9e03f4b

Pearl1594 force-pushed the clvm-enhancements branch from 5fc1f12 to 9e03f4b Compare February 9, 2026 21:39

Pearl1594 added 2 commits February 10, 2026 19:48

add support for proper cleanup of snapshots and prevent vol snapshot …

96edadc

…of running vm

remove snap vol restriction for sunning vms

f9d8062

harikrishna-patnala added this to the 4.23.0 milestone Feb 17, 2026

weizhouapache reviewed Feb 17, 2026

View reviewed changes

Comment thread ...apshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java

Pearl1594 force-pushed the clvm-enhancements branch from a08e7a5 to df61d6f Compare February 17, 2026 15:04

refactor clvm code

43e9384

Pearl1594 force-pushed the clvm-enhancements branch from df61d6f to 43e9384 Compare February 17, 2026 15:16

boring-cyborg Bot added component:api component:compute component:orchestration labels Feb 17, 2026

add support for live migration

c9dd7ed

Pearl1594 force-pushed the clvm-enhancements branch from 3f900e8 to c9dd7ed Compare February 17, 2026 22:54

add support for migrating lvm lock

4984ee5

Pearl1594 added 2 commits February 19, 2026 15:42

clvm deletion called explicitly

190b201

made necessary changes to allow migration of lock and deletion of det…

8a7e48a

…ached volumes

RosiKyu added status:tested and removed status:testing labels Jun 8, 2026

Pearl Dsilva added 3 commits June 8, 2026 13:51

fix async backup for clvm type pools

ebe8fa0

Merge branch 'main' of https://github.com/apache/cloudstack into clvm…

6a32def

…-enhancements

merge issue - unused imports

e951965

github-actions Bot removed the status:has-conflicts label Jun 8, 2026

github-actions Bot mentioned this pull request Jun 8, 2026

[repo-status] Daily Status Report – June 8, 2026 #13381

Closed

winterhazel reviewed Jun 8, 2026

View reviewed changes

Comment thread ...ne/storage/src/main/java/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java

address comment - extract common code for endpoint identification if …

90843cb

…clvm pool type

JoaoJandre reviewed Jun 9, 2026

View reviewed changes

Address comments - add early return guard to reduce indentation

9ea3d8c

github-actions Bot mentioned this pull request Jun 9, 2026

[repo-status] Daily Status Report – June 9, 2026 #13386

Open

winterhazel reviewed Jun 9, 2026

View reviewed changes

Pearl Dsilva added 2 commits June 9, 2026 16:24

remove unused method and return early to reduce indents

d253b4c

cleanup tests - with removal of unused methods

729f79a

		String details = preMigAnswer != null ? preMigAnswer.getDetails() : "null answer returned";
		logger.warn("PreMigrationCommand failed for CLVM/CLVM_NG VM [{}] on source host [{}]: {}. Migration will continue but may fail if volumes are exclusively locked.", vmTO.getName(), srcHost.getId(), details);

Conversation

Pearl1594 commented Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

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 Feb 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Pearl1594 commented Feb 11, 2026

Uh oh!

blueorangutan commented Feb 11, 2026

Uh oh!

blueorangutan commented Feb 11, 2026

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

Pearl1594 commented Feb 18, 2026

Uh oh!

blueorangutan commented Feb 18, 2026

Uh oh!

blueorangutan commented Feb 18, 2026

Uh oh!

Pearl1594 commented Feb 18, 2026

Uh oh!

blueorangutan commented Feb 18, 2026

Uh oh!

blueorangutan commented Feb 18, 2026

Uh oh!

Pearl1594 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

Pearl1594 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

Uh oh!

Pearl1594 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

Pearl1594 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

sonarqubecloud Bot commented Jun 8, 2026

Quality Gate failed

Uh oh!

JoaoJandre left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JoaoJandre Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

Pearl1594 Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

JoaoJandre Jun 9, 2026

Choose a reason for hiding this comment

Uh oh!

Pearl1594 commented Feb 9, 2026 •

edited

Loading

codecov Bot commented Feb 9, 2026 •

edited

Loading

codecov Bot commented Feb 17, 2026 •

edited

Loading

Pearl1594 Jun 9, 2026 •

edited

Loading