Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Preserve VM settings on Instance Snapshot revert for Custom Service Offering #12555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 2 commits into apache:4.20 from shapeblue:snapshot-revert
Feb 3, 2026

Conversation

@abh1sar
Copy link
Collaborator

@abh1sar abh1sar commented Jan 30, 2026

Description

This PR fixes #11272

On revert to an instance snapshot, VM instance details were fully replaced with only the snapshot-stored details (CPU_NUMBER, CPU_SPEED, MEMORY) for dynamic service offerings, so any other details (e.g. boot/UEFI, keyboard, or other custom settings) were lost. This change updates revert to only restore those three service-offering details via addDetail, leaving all other VM instance details unchanged.

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):

Before fix:

Initial settings
Screenshot 2026年01月30日 at 2 44 53 PM

Settings after snapshot revert
Screenshot 2026年01月30日 at 2 45 12 PM

How Has This Been Tested?

  1. Create a custom service offering
  2. Create an instance with the custom service offering
  3. Shut down Instance and set UEFI=Secure in Instance settings
  4. Start Instance Create Instance snapshot (with or without memory)
  5. Stop Instance and Revert to Snapshot
  6. Start Instance
  7. Verify that none of the VM settings are lost.

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

Copy link
Collaborator Author

abh1sar commented Jan 30, 2026

@blueorangutan package

Copy link

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

Copy link

codecov bot commented Jan 30, 2026 •
edited
Loading

Codecov Report

❌ Patch coverage is 77.77778% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.26%. Comparing base (56a39e6) to head (5ce6633).
⚠️ Report is 87 commits behind head on 4.20.

Files with missing lines Patch % Lines
...a/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java 77.77% 1 Missing and 1 partial ⚠️
Additional details and impacted files 
@@ Coverage Diff @@
## 4.20 #12555 +/- ##
============================================
+ Coverage 16.23% 16.26% +0.02% 
- Complexity 13378 13427 +49 
============================================
 Files 5657 5660 +3 
 Lines 498866 499921 +1055 
 Branches 60545 60699 +154 
============================================
+ Hits 81011 81322 +311 
- Misses 408821 409526 +705 
- Partials 9034 9073 +39
Flag Coverage Δ
uitests 4.16% <ø> (+0.15%) ⬆️
unittests 17.11% <77.77%> (+0.02%) ⬆️

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.

Copy link

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

Copy link
Collaborator Author

abh1sar commented Jan 30, 2026

@blueorangutan package

Copy link

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

Copy link

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

Copy link
Contributor

@sureshanaparti sureshanaparti left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

clgtm

Copy link
Contributor

@blueorangutan test

Copy link

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

Copy link

[SF] Trillian Build Failed (tid-15344)

Copy link
Contributor

@blueorangutan test

Copy link

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

Copy link

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

Test Result Time (s) Test File
test_01_redundant_vpc_site2site_vpn Failure 466.52 test_vpc_vpn.py

Copy link
Contributor

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

Copy link
Collaborator

@RosiKyu RosiKyu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

  1. Created a custom service offering
  2. Create an instance with the custom service offering
  3. Started the Instance and created Instance snapshot (with memory)
  4. Stopped the Instance and Reverted to Snapshot
  5. Started the Instance
  6. Verified that none of the VM settings were lost
Image

@DaanHoogland DaanHoogland merged commit 9ae696d into apache:4.20 Feb 3, 2026
26 checks passed
@DaanHoogland DaanHoogland deleted the snapshot-revert branch February 3, 2026 13:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sureshanaparti sureshanaparti sureshanaparti approved these changes

@weizhouapache weizhouapache weizhouapache approved these changes

+1 more reviewer

@RosiKyu RosiKyu RosiKyu approved these changes

Reviewers whose approvals may not affect merge requirements

Labels

None yet

Projects

None yet

Milestone

4.20.3

Development

Successfully merging this pull request may close these issues.

Instance snapshots reverting does not preserve settings.

AltStyle によって変換されたページ (->オリジナル) /