Fix snapshot chaining on Xen #12597
Fix snapshot chaining on Xen #12597
Conversation
|
@blueorangutan package |
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## 4.22 #12597 +/- ##
=========================================
Coverage 17.62% 17.62%
- Complexity 15663 15665 +2
=========================================
Files 5915 5915
Lines 531171 531186 +15
Branches 64938 64938
=========================================
+ Hits 93601 93608 +7
- Misses 427031 427037 +6
- Partials 10539 10541 +2
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
|
@blueorangutan package |
|
@sureshanaparti 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. |
There was a problem hiding this comment.
Pull request overview
This PR fixes issue #12524 where the snapshot.delta.max configuration was not being respected on XenServer after the introduction of the Hidden state. The fix ensures that hidden snapshots are properly considered when calculating snapshot chain length, preventing unending snapshot chains. It also resolves a regression in snapshot deletion by using the correct NOTIN operator instead of NEQ when excluding multiple states.
Changes:
- Modified snapshot chain calculation to include Hidden state snapshots alongside Ready state snapshots
- Added new DAO method to query snapshots by multiple states using the IN operator
- Fixed snapshot deletion regression by properly using NOTIN operator for multiple state exclusion
Reviewed changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 2 comments.
| File | Description |
|---|---|
| DefaultSnapshotStrategy.java | Updated getSnapshotImageStoreRef to include Hidden snapshots in chain calculation by using the new multi-state query method |
| SnapshotDataStoreDaoImpl.java | Added search builders for NOTIN and IN operations, implemented new multi-state query method, fixed snapshot deletion query |
| SnapshotDataStoreDao.java | Added interface method signature for querying snapshots by multiple states |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
...chema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImpl.java
Show resolved
Hide resolved
...e/snapshot/src/main/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategy.java
Show resolved
Hide resolved
|
Packaging result [SF]: ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 16711 |
|
@blueorangutan package |
|
@JoaoJandre 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 16712 |
|
@blueorangutan test ol9 xcpng83 |
|
@DaanHoogland a [SL] Trillian-Jenkins test job (ol9 mgmt + xcpng83) has been kicked to run smoke tests |
|
[SF] Trillian test result (tid-15385)
|
4 participants
Description
This PR fixes #12524.
After the introduction of the
Hiddenstate, the snapshot chain calculation no longer works as expected for XenServer as it does not consider hidden snapshots as part of the chain, possibly leading to unending chains. This PR fixes this issue by adding the hidden snapshots to the chain calculation.This PR also fixes a regression introduced in commit d700e2d which made snapshot deletion impossible.
Types of changes
Feature/Enhancement Scale or Bug Severity
Feature/Enhancement Scale
Bug Severity
Screenshots (if appropriate):
How Has This Been Tested?
In an environment using XCP-ng, I set
snapshot.delta.maxto 3 and followed the steps below:Before the changes, the new snapshot would be part of the old chain. With the changes, the last snapshot is a full snapshot that is not part of the old chain.