Fix Revert Instance to Snapshot with custom service offering by abh1sar · Pull Request #12885 · apache/cloudstack

abh1sar · 2026-03-25T04:22:16Z

Description

This PR fixes a regression in Revert VM to Snapshot with Dynamic/Custom service offering.

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?

Create an Instance with Custom service offering
Take a VM snapshot
Revert the snapshot

Before fix :

2026-03-24 10:26:04,056 ERROR [c.c.a.ApiAsyncJobDispatcher] (API-Job-Executor-5:[ctx-a2bbedfa, job-76]) (logid:5c30faaa) Unexpected exception while executing org.apache.cloudstack.api.command.admin.vmsnapshot.RevertToVMSnapshotCmdByAdmin com.cloud.utils.exception.CloudRuntimeException: While the VM is running, only scalling up it is supported. New service offering {"memory": 512, "speed": 500, "cpu": 1} should have at least one value (ram, speed or cpu) greater than the current values {"memory": 512, "speed": 500, "cpu": 1}.
at com.cloud.vm.snapshot.VMSnapshotManagerImpl.orchestrateRevertToVMSnapshot(VMSnapshotManagerImpl.java:954)

After fix:

Revert was successful.

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

Copilot

Pull request overview

Fixes a regression in VM snapshot revert for VMs using dynamic/custom service offerings by avoiding unnecessary service-offering “upgrade” operations during revert.

Changes:

Tightens/clarifies validation around allowed VM state vs snapshot type for revert (disk-only vs disk+memory).
Reworks service offering handling during revert by introducing a “needs change” check before attempting to change the VM’s service offering.
Updates revert transaction flow to only call changeUserVmServiceOffering(...) when a change is detected.

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

codecov · 2026-03-25T04:37:35Z

Codecov Report

❌ Patch coverage is 70.00000% with 6 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.25%. Comparing base (4b7370a) to head (64c9a96).
⚠️ Report is 1 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...a/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java	70.00%	5 Missing and 1 partial ⚠️

Additional details and impacted files

@@ Coverage Diff @@## 4.20 #12885 +/- ##
=========================================
Coverage 16.25% 16.25% - Complexity 13419 13421 +2 
=========================================
Files 5664 5664 Lines 500467 500478 +11 Branches 60780 60782 +2 =========================================
+ Hits 81354 81365 +11 - Misses 410018 410019 +1 + Partials 9095 9094 -1

Flag	Coverage Δ
uitests	`4.15% <ø> (ø)`
unittests	`17.11% <70.00%> (+<0.01%)`	⬆️

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.

abh1sar · 2026-03-25T04:42:29Z

@blueorangutan package

blueorangutan · 2026-03-25T04:44:04Z

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

Copilot

Pull request overview

Copilot reviewed 2 out of 2 changed files in this pull request and generated no new comments.

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

blueorangutan · 2026-03-25T05:33:22Z

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

abh1sar · 2026-03-25T16:01:09Z

@blueorangutan test

blueorangutan · 2026-03-25T16:02:07Z

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

blueorangutan · 2026-03-25T16:53:49Z

[SF] Trillian Build Failed (tid-15737)

winterhazel

CLGTM, but did not test it yet

abh1sar · 2026-03-26T02:39:53Z

@blueorangutan test

blueorangutan · 2026-03-26T02:42:03Z

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

blueorangutan · 2026-03-26T03:31:30Z

[SF] Trillian Build Failed (tid-15743)

abh1sar · 2026-03-26T05:57:15Z

@blueorangutan package

blueorangutan · 2026-03-26T05:58:04Z

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

blueorangutan · 2026-03-26T06:53:47Z

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

RosiKyu

LGTM

abh1sar · 2026-03-26T16:31:06Z

@blueorangutan test

blueorangutan · 2026-03-26T16:32:04Z

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

…pl.java Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com>

blueorangutan · 2026-03-27T11:13:24Z

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

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	`Failure`	3687.89	test_kubernetes_clusters.py
test_01_deployVMInSharedNetwork	`Failure`	282.62	test_network.py
test_02_list_cpvm_vm	`Failure`	0.04	test_ssvm.py
test_04_cpvm_internals	`Failure`	0.06	test_ssvm.py

* Fix revertVM with custom svc offering

abh1sar added this to the 4.20.3 milestone Mar 25, 2026

abh1sar requested review from Copilot and winterhazel March 25, 2026 04:22

Copilotstarted reviewing on behalf of abh1sar March 25, 2026 04:22 View session

abh1sar requested a review from nvazquez March 25, 2026 04:23

abh1sar added the status:needs-testing label Mar 25, 2026

CopilotAI reviewed Mar 25, 2026
View reviewed changes

abh1sar force-pushed the custom-svc-off branch from fcd2160 to 5e066a1Compare March 25, 2026 04:40

abh1sar added the Severity:BLOCKER label Mar 25, 2026

abh1sar requested a review from Copilot March 25, 2026 05:09

Copilotstarted reviewing on behalf of abh1sar March 25, 2026 05:10 View session

CopilotAI reviewed Mar 25, 2026
View reviewed changes

winterhazel approved these changes Mar 26, 2026
View reviewed changes

Comment threadserver/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java Outdated

abh1sar closed this Mar 26, 2026

abh1sar reopened this Mar 26, 2026

abh1sar requested a review from RosiKyu March 26, 2026 07:38

RosiKyu approved these changes Mar 26, 2026
View reviewed changes

abh1sarand others added 2 commits March 27, 2026 08:56

Fix revertVM with custom svc offering
03b0adf

Update server/src/main/java/com/cloud/vm/snapshot/VMSnapshotManagerIm…
64c9a96
…pl.java Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com>

abh1sar force-pushed the custom-svc-off branch from e5ee0de to 64c9a96Compare March 27, 2026 03:26

abh1sar merged commit b22dbbe into apache:4.20Mar 27, 2026
26 checks passed

abh1sar deleted the custom-svc-off branch March 27, 2026 04:49

DaanHoogland pushed a commit that referenced this pull request Apr 17, 2026
Fix Revert Instance to Snapshot with custom service offering (#12885)
4265eac
* Fix revertVM with custom svc offering

DaanHoogland pushed a commit that referenced this pull request Apr 20, 2026
Fix Revert Instance to Snapshot with custom service offering (#12885)
a127a26
* Fix revertVM with custom svc offering

Uh oh!

Conversation

abh1sar commented Mar 25, 2026

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!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

abh1sar commented Mar 25, 2026

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

abh1sar commented Mar 25, 2026

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

blueorangutan commented Mar 25, 2026

Uh oh!

winterhazel left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

abh1sar commented Mar 26, 2026

Uh oh!

blueorangutan commented Mar 26, 2026

Uh oh!

blueorangutan commented Mar 26, 2026

Uh oh!

abh1sar commented Mar 26, 2026

Uh oh!

blueorangutan commented Mar 26, 2026

Uh oh!

blueorangutan commented Mar 26, 2026

Uh oh!

RosiKyu left a comment

Choose a reason for hiding this comment

Uh oh!

abh1sar commented Mar 26, 2026

Uh oh!

blueorangutan commented Mar 26, 2026

Uh oh!

Uh oh!

blueorangutan commented Mar 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecovBot commented Mar 25, 2026•
edited
Loading