kvm: let libvirt remove RBD snapshots on volume delete by wido · Pull Request #13763 · apache/cloudstack

wido · 2026-07-31T22:25:28Z

Description

LibvirtStorageAdaptor#deletePhysicalDisk manually connected to Ceph via librados/librbd to unprotect and remove every snapshot of an RBD image before asking libvirt to delete the volume. libvirt's RBD storage backend has supported VIR_STORAGE_VOL_DELETE_WITH_SNAPSHOTS since 1.2.20, which does the same unprotect/remove internally. Pass that flag instead and drop the manual cleanup.

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

LibvirtStorageAdaptor#deletePhysicalDisk manually connected to Ceph via librados/librbd to unprotect and remove every snapshot of an RBD image before asking libvirt to delete the volume. libvirt's RBD storage backend has supported VIR_STORAGE_VOL_DELETE_WITH_SNAPSHOTS since 1.2.20, which does the same unprotect/remove internally. Pass that flag instead and drop the manual cleanup.

codecov · 2026-07-31T22:33:55Z

Codecov Report

❌ Patch coverage is 0% with 4 lines in your changes missing coverage. Please review.
✅ Project coverage is 19.65%. Comparing base (4f11707) to head (b2c5e04).

Files with missing lines	Patch %	Lines
.../hypervisor/kvm/storage/LibvirtStorageAdaptor.java	0.00%	4 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## main #13763 +/- ##
=========================================
Coverage 19.65% 19.65% + Complexity 19792 19789 -3 
=========================================
Files 6368 6368 Lines 574881 574843 -38 Branches 70351 70349 -2 =========================================
- Hits 112970 112963 -7 + Misses 449639 449607 -32 - Partials 12272 12273 +1

Flag	Coverage Δ
uitests	`3.41% <ø> (ø)`
unittests	`20.92% <0.00%> (+<0.01%)`	⬆️

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.

weizhouapache · 2026-07-31T22:47:19Z

nice !

wido · 2026-08-01T14:17:56Z

nice !

Tnx! Fun is that I implemented this in Libvirt over 10y ago and totally forgot to fix it in CloudStack.

Simple change to reduce the amount of code, better to have Libvirt do this.

weizhouapache · 2026-08-01T19:01:16Z

nice !
Tnx! Fun is that I implemented this in Libvirt over 10y ago and totally forgot to fix it in CloudStack.
Simple change to reduce the amount of code, better to have Libvirt do this.

yeah. I have waited 4 years for the fix for #6180 😆

wido · 2026-08-02T06:57:38Z

nice !
Tnx! Fun is that I implemented this in Libvirt over 10y ago and totally forgot to fix it in CloudStack.
Simple change to reduce the amount of code, better to have Libvirt do this.
yeah. I have waited 4 years for the fix for #6180 😆

Here is the first one! Have a look at the code and review it.

andrijapanicsb · 2026-08-02T19:50:25Z

@blueorangutan package kvm

blueorangutan · 2026-08-02T19:52:03Z

@andrijapanicsb a [SL] Jenkins job has been kicked to build packages. It will be bundled with kvm SystemVM template(s). I'll keep you posted as I make progress.

blueorangutan · 2026-08-02T20:30:31Z

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

weizhouapache · 2026-08-02T22:23:04Z

@blueorangutan package

blueorangutan · 2026-08-02T22:24:04Z

@weizhouapache 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-08-02T23:10:59Z

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

DaanHoogland · 2026-08-03T06:00:21Z

@wido, given your comments, should we add this in 4.20 LTS?

Copilot

Pull request overview

This PR simplifies KVM RBD volume deletion by delegating RBD snapshot cleanup to libvirt, using the VIR_STORAGE_VOL_DELETE_WITH_SNAPSHOTS delete flag, and removing the prior manual Ceph (librados/librbd) snapshot unprotect/remove logic from deletePhysicalDisk.

Changes:

Removed manual Ceph RBD snapshot unprotect/remove steps prior to volume deletion.
Added the VIR_STORAGE_VOL_DELETE_WITH_SNAPSHOTS flag (raw value) and conditionally applies it when deleting RBD-backed libvirt volumes.
Centralized the “delete with snapshots” behavior inside deleteVol(...) for RBD pools.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

wido · 2026-08-03T07:11:48Z

@wido, given your comments, should we add this in 4.20 LTS?

It is not going to fix anything, this is mainly code cleanup. I would not put that into an LTS personally

DaanHoogland

clgtm

DaanHoogland · 2026-08-03T07:39:18Z

@blueorangutan test

blueorangutan · 2026-08-03T07:40:03Z

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

andrijapanicsb · 2026-08-03T07:52:31Z

@weizhouapache the DEB packaging seems randomly failing - I have run it on this specific PR to isolate a potential issue with my own PR ("prove" random failure on this PR) - and it seems it is random indeed? See #13656 (comment)

Will kick off another round, really curious if it's going to fail.

weizhouapache · 2026-08-03T08:07:45Z

@weizhouapache the DEB packaging seems randomly failing - I have run it on this specific PR to isolate a potential issue with my own PR ("prove" random failure on this PR) - and it seems it is random indeed? See #13656 (comment)
Will kick off another round, really curious if it's going to fail.

it failed at

22:02:41 [ERROR] Failures: 22:02:41 [ERROR] MetalinkDirectTemplateDownloaderTest.testCheckUrlMetalink:33

due to


22:02:39 20:02:40.901 [main] ERROR org.apache.cloudstack.direct.download.HttpDirectTemplateDownloader - Cannot reach URL: http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2 due to: The host did not accept the connection within timeout of 1000 ms
22:02:40 org.apache.commons.httpclient.ConnectTimeoutException: The host did not accept the connection within timeout of 1000 ms
22:02:40 at org.apache.commons.httpclient.protocol.ReflectionSocketFactory.createSocket(ReflectionSocketFactory.java:155) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.commons.httpclient.protocol.DefaultProtocolSocketFactory.createSocket(DefaultProtocolSocketFactory.java:125) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.commons.httpclient.HttpConnection.open(HttpConnection.java:707) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.commons.httpclient.MultiThreadedHttpConnectionManager$HttpConnectionAdapter.open(MultiThreadedHttpConnectionManager.java:1361) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.commons.httpclient.HttpMethodDirector.executeWithRetry(HttpMethodDirector.java:387) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.commons.httpclient.HttpMethodDirector.executeMethod(HttpMethodDirector.java:171) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:397) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.commons.httpclient.HttpClient.executeMethod(HttpClient.java:323) ~[commons-httpclient-3.1.jar:?]
22:02:40 at org.apache.cloudstack.direct.download.HttpDirectTemplateDownloader.checkUrl(HttpDirectTemplateDownloader.java:120) ~[classes/:?]
22:02:40 at org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloader.checkUrl(MetalinkDirectTemplateDownloader.java:143) ~[classes/:?]
22:02:40 at org.apache.cloudstack.direct.download.MetalinkDirectTemplateDownloaderTest.testCheckUrlMetalink(MetalinkDirectTemplateDownloaderTest.java:32) ~[test-classes/:?]

cc @NuxRo cloudstack build has dependency on your server 😄

blueorangutan · 2026-08-03T08:24:21Z

[SF] Trillian Build Failed (tid-16672)

weizhouapache · 2026-08-03T08:40:32Z

@blueorangutan test

blueorangutan · 2026-08-03T08:42:03Z

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

andrijapanicsb · 2026-08-03T09:11:57Z

hehehehe - btw, http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2 - works for me....

weizhouapache · 2026-08-03T09:22:50Z

hehehehe - btw, http://dl.openvm.eu/cloudstack/macchinina/x86_64/macchinina-kvm.qcow2.bz2 - works for me....

yes, the issue happened very rarely

blueorangutan · 2026-08-03T09:40:05Z

[SF] Trillian Build Failed (tid-16676)

weizhouapache · 2026-08-03T09:44:56Z

@blueorangutan test

blueorangutan · 2026-08-03T09:46:03Z

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

andrijapanicsb · 2026-08-03T09:51:31Z

Is this behaviour consistent with general ACS behaviour - I think, for some funny reason - we do leave volume snapshots hanging around when an original volume is deleted - we should inclusively (storage-unrelated, NFS, CEPH, etc,) remove all related volume snapshots - if that is the decision - not just CEPH (but I absolutely support this garbage collection 😁 )

weizhouapache · 2026-08-03T09:56:55Z

Is this behaviour consistent with general ACS behaviour - I think, for some funny reason - we do leave volume snapshots hanging around when an original volume is deleted - we should inclusively (storage-unrelated, NFS, CEPH, etc,) remove all related volume snapshots - if that is the decision - not just CEPH (but I absolutely support this garbage collection 😁 )

I think it is ceph-only: volume cannot be removed if volume snapshots exist.

wido · 2026-08-03T10:05:40Z

Is this behaviour consistent with general ACS behaviour - I think, for some funny reason - we do leave volume snapshots hanging around when an original volume is deleted - we should inclusively (storage-unrelated, NFS, CEPH, etc,) remove all related volume snapshots - if that is the decision - not just CEPH (but I absolutely support this garbage collection 😁 )
I think it is ceph-only: volume cannot be removed if volume snapshots exist.

That is correct, Ceph refuses the removal if a snapshot exists.

Again, this PR is just to clean-up code in CloudStack's Agent. Less code == better

blueorangutan · 2026-08-04T02:01:29Z

[SF] Trillian test result (tid-16678)
Environment: kvm-ol8 (x2), zone: Advanced Networking with Mgmt server ol8
Total time taken: 55408 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr13763-t16678-kvm-ol8.zip
Smoke tests completed. 156 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

wido added component:kvm component:ceph labels Jul 31, 2026

DaanHoogland requested a review from Copilot August 3, 2026 05:59

Copilotstarted reviewing on behalf of DaanHoogland August 3, 2026 06:00 View session

CopilotAI reviewed Aug 3, 2026
View reviewed changes

DaanHoogland added the type:cleanup label Aug 3, 2026

DaanHoogland added this to the 4.24.0 milestone Aug 3, 2026

DaanHoogland approved these changes Aug 3, 2026
View reviewed changes

Uh oh!

Conversation

wido commented Jul 31, 2026

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Uh oh!

codecovBot commented Jul 31, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

weizhouapache commented Jul 31, 2026

Uh oh!

wido commented Aug 1, 2026

Uh oh!

weizhouapache commented Aug 1, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

wido commented Aug 2, 2026

Uh oh!

andrijapanicsb commented Aug 2, 2026

Uh oh!

blueorangutan commented Aug 2, 2026

Uh oh!

blueorangutan commented Aug 2, 2026

Uh oh!

weizhouapache commented Aug 2, 2026

Uh oh!

blueorangutan commented Aug 2, 2026

Uh oh!

blueorangutan commented Aug 2, 2026

Uh oh!

DaanHoogland commented Aug 3, 2026

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

wido commented Aug 3, 2026

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Aug 3, 2026

Uh oh!

blueorangutan commented Aug 3, 2026

Uh oh!

andrijapanicsb commented Aug 3, 2026

Uh oh!

weizhouapache commented Aug 3, 2026

Uh oh!

blueorangutan commented Aug 3, 2026

Uh oh!

weizhouapache commented Aug 3, 2026

Uh oh!

blueorangutan commented Aug 3, 2026

Uh oh!

andrijapanicsb commented Aug 3, 2026

Uh oh!

weizhouapache commented Aug 3, 2026

Uh oh!

blueorangutan commented Aug 3, 2026

Uh oh!

weizhouapache commented Aug 3, 2026

Uh oh!

blueorangutan commented Aug 3, 2026

Uh oh!

andrijapanicsb commented Aug 3, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

weizhouapache commented Aug 3, 2026

Uh oh!

wido commented Aug 3, 2026

Uh oh!

blueorangutan commented Aug 4, 2026

Uh oh!

Reviewers

Assignees

Labels

codecovBot commented Jul 31, 2026•
edited
Loading

weizhouapache commented Aug 1, 2026•
edited
Loading

andrijapanicsb commented Aug 3, 2026•
edited
Loading