Add NULL check during restoreVM operation when host is removed by nvazquez · Pull Request #13779 · apache/cloudstack

nvazquez · 2026-08-03T18:41:16Z

Description

This PR addresses a fix for the following use case:

Create VM
Start VM
Stop VM
Delete Host where VM was started
Restore VM -> Restore VM command failed, VM ended up with two ROOT volumes, one of them is in Allocated state
Expected result: VM restored (with new template)

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?

…e#571) * Add NULL check during restore VM operation when host is not available/removed * fix line ending pre commit failure * update logging with details of removed host and vm --------- Co-authored-by: Sachin R Doddaguni <s_rudrappadoddagu@apple.com> (cherry picked from commit 1dbda12ccdca1aaf86ef8f9b185986c9d22b567e)

Damans227 · 2026-08-04T15:36:30Z

+                // host row may have been hard-deleted from DB, treat like removed
                if (host == null) {
-                    logger.warn("Host {} not found", hostId);
+                    s_logger.warn(String.format("Host with id %s not found in DB for VM %s (%s)",


s_logger doesn't exist in this class. It only has logger (see the line right below this one). This won't compile.

Damans227 · 2026-08-04T15:36:48Z

+                // host row may have been hard-deleted from DB, treat like removed
                if (host == null) {
-                    logger.warn("Host {} not found", hostId);
+                    s_logger.warn(String.format("Host with id %s not found in DB for VM %s (%s)",


Use {} placeholders here to match the branch below, instead of String.format.

Damans227 · 2026-08-04T15:45:35Z

 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.ApiConstants;
+import com.cloud.host.Status;


com.cloud.host.Status is out of place here, mixed into the org.apache.cloudstack.* block.

Damans227 · 2026-08-04T15:46:05Z

    }

+    @Test
+    public void testRestoreVirtualMachineWhenHostRemoved() throws ResourceUnavailableException, InsufficientCapacityException, ResourceAllocationException {


Should we also add a test for the host-row-missing case, not just Removed?

vladimirpetrov · 2026-08-07T07:21:40Z

@blueorangutan package

blueorangutan · 2026-08-07T07:24:05Z

@vladimirpetrov 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-08-07T07:34:34Z

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

vladimirpetrov · 2026-08-07T07:50:17Z

@blueorangutan package

blueorangutan · 2026-08-07T07:52:04Z

@vladimirpetrov 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-08-07T08:03:15Z

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

nvazquez · 2026-08-07T10:11:52Z

@blueorangutan package

blueorangutan · 2026-08-07T10:14:04Z

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

codecov · 2026-08-07T10:20:15Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 3.69%. Comparing base (5328528) to head (d7cd7ef).

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

HEAD has 1 upload less than BASE

Flag BASE (5328528) HEAD (d7cd7ef)

unittests 1 0

Additional details and impacted files

@@              Coverage Diff              @@
##               4.22   #13779       +/-   ##
=============================================
- Coverage     17.69%    3.69%   -14.01%     
=============================================
  Files          5925      449     -5476     
  Lines        533539    38176   -495363     
  Branches      65274     7072    -58202     
=============================================
- Hits          94427     1409    -93018     
+ Misses       428435    36580   -391855     
+ Partials      10677      187    -10490

Flag	Coverage Δ
uitests	`3.69% <ø> (ø)`
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.

blueorangutan · 2026-08-07T10:28:54Z

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

nvazquez · 2026-08-07T10:35:46Z

@blueorangutan package

blueorangutan · 2026-08-07T10:38:04Z

@nvazquez 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-08-07T11:15:56Z

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

vladimirpetrov · 2026-08-07T12:19:26Z

@blueorangutan package

blueorangutan · 2026-08-07T12:20:05Z

@vladimirpetrov 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-08-07T12:34:05Z

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

sachindoddaguni and others added 2 commits August 3, 2026 15:37

Handle null host in VM restore to prevent NPE on deleted host records

4876cc9

nvazquez added this to the 4.22.2 milestone Aug 3, 2026

nvazquez requested review from Damans227, sureshanaparti and vladimirpetrov August 3, 2026 18:41

nvazquez added the type:bug label Aug 3, 2026

Damans227 reviewed Aug 4, 2026

View reviewed changes

Fix build

d7cd7ef

Uh oh!

Conversation

nvazquez commented Aug 3, 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!

Damans227 Aug 4, 2026

Choose a reason for hiding this comment

Uh oh!

Damans227 Aug 4, 2026

Choose a reason for hiding this comment

Uh oh!

Damans227 Aug 4, 2026

Choose a reason for hiding this comment

Uh oh!

Damans227 Aug 4, 2026

Choose a reason for hiding this comment

Uh oh!

vladimirpetrov commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

vladimirpetrov commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

nvazquez commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

codecov Bot commented Aug 7, 2026

Codecov Report

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

nvazquez commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

vladimirpetrov commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

blueorangutan commented Aug 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants