xenserver: destroy halted vm on expunge #10833

shwstppr · 2025-05-08T09:08:56Z

Description

Addresses #9175 (comment)

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?

Tested on XCP-ng 8.2

Deploy a VM

(localcloud) 🐱 > list virtualmachines id=3325d71e-d808-451e-abbe-b923226ebc33 filter=id,name,state,instancename,
{
  "count": 1,
  "virtualmachine": [
    {
      "id": "3325d71e-d808-451e-abbe-b923226ebc33",
      "instancename": "i-2-5-VM",
      "name": "VM-3325d71e-d808-451e-abbe-b923226ebc33",
      "state": "Running"
    }
  ]
}

Check on XCP-ng host that VM is showing as running

[14:54 pr10833-t13246-xcpng82-xs1 ~]# xe vm-list name-label=i-2-5-VM
uuid ( RO)           : 318c6cd0-fae7-c095-706e-ec840b2a0787
     name-label ( RW): i-2-5-VM
    power-state ( RO): running

Destroy VM with expunge from ACS

(localcloud) 🐱 > destroy virtualmachine expunge=true id=3325d71e-d808-451e-abbe-b923226ebc33 
{
  "null": {
    "affinitygroup": [],
    "nic": [],
    "securitygroup": [],
    "tags": []
  }
}

On XCP-ng check VM is not present in HALTED state,

[14:57 pr10833-t13246-xcpng82-xs1 ~]# xe vm-list |grep 'power-state ( RO): halted' |wc -l
0

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

Addresses apache#9175 (comment) Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr · 2025-05-08T09:09:34Z

@Pearl1594 kindly check. Close this PR and pick changes if needed

@blueorangutan package

blueorangutan · 2025-05-08T09:10:03Z

@shwstppr 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 · 2025-05-08T09:17:16Z

Codecov Report

Attention: Patch coverage is 4.65116% with 41 lines in your changes missing coverage. Please review.

Project coverage is 15.17%. Comparing base (f0838cd) to head (93686c7).
Report is 5 commits behind head on 4.19.

Files with missing lines	Patch %	Lines
...wrapper/xenbase/CitrixCleanupVMCommandWrapper.java	5.40%	35 Missing ⚠️
.../main/java/com/cloud/hypervisor/XenServerGuru.java	0.00%	6 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.19   #10833      +/-   ##
============================================
- Coverage     15.17%   15.17%   -0.01%     
- Complexity    11339    11341       +2     
============================================
  Files          5414     5415       +1     
  Lines        475185   475321     +136     
  Branches      57991    58003      +12     
============================================
+ Hits          72105    72123      +18     
- Misses       395018   395132     +114     
- Partials       8062     8066       +4

Flag	Coverage Δ
uitests	`4.28% <ø> (ø)`
unittests	`15.89% <4.65%> (-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.

blueorangutan · 2025-05-08T10:21:30Z

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

weizhouapache · 2025-05-08T17:56:06Z

@blueorangutan test ol8 xcpng82

blueorangutan · 2025-05-08T17:58:04Z

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

...a/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java

…or/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java

shwstppr · 2025-05-09T06:23:20Z

@blueorangutan package

blueorangutan · 2025-05-09T06:24:04Z

@shwstppr 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 · 2025-05-09T07:26:20Z

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

weizhouapache · 2025-05-09T07:29:48Z

it looks like some vms are not cleaned

[07:28 pr10833-t13241-xcpng82-xs1 ~]# xe vm-list |grep 'power-state ( RO): halted' |wc -l
289

Signed-off-by: Abhishek Kumar <[email protected]>

weizhouapache · 2025-05-09T14:40:24Z

@blueorangutan package

blueorangutan · 2025-05-09T14:42:04Z

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

shwstppr · 2025-05-09T15:01:06Z

@weizhouapache should be okay now. I used wrong condition by mistake. Added test result in the description.

blueorangutan · 2025-05-09T15:11:05Z

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

Test	Result	Time (s)	Test File

weizhouapache · 2025-05-09T15:15:42Z

@weizhouapache should be okay now. I used wrong condition by mistake. Added test result in the description.

great, thanks @shwstppr for the fixing
I will kick a trillian test when packages are ready, and verify during the test

blueorangutan · 2025-05-09T15:34:32Z

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

weizhouapache · 2025-05-09T15:50:25Z

@blueorangutan package

blueorangutan · 2025-05-09T15:52:04Z

@weizhouapache 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 · 2025-05-09T16:47:18Z

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

shwstppr · 2025-05-09T19:46:10Z

@blueorangutan test ol8 xcpng82 keepEnv

blueorangutan · 2025-05-09T19:48:04Z

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

weizhouapache

lgtm

[08:58 pr10833-t13252-xcpng82-xs1 ~]# xe vm-list |grep "power-state ( RO): halted" |wc -l
1

only 1 Stopped VM is found

DaanHoogland · 2025-05-10T09:11:08Z

@harikrishna-patnala , are your concerns met? (can we merge?)

blueorangutan · 2025-05-10T17:18:19Z

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

Test	Result	Time (s)	Test File

Pearl1594

LGTM - tested, works as expected.

harikrishna-patnala

code LGTM

* xenserver: destroy halted vm on expunge Signed-off-by: Abhishek Kumar <[email protected]>

xenserver: destroy halted vm on expunge

0f177c2

Addresses apache#9175 (comment) Signed-off-by: Abhishek Kumar <[email protected]>

boring-cyborg bot added the component:XenServer label May 8, 2025

harikrishna-patnala reviewed May 9, 2025

View reviewed changes

...a/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java Show resolved Hide resolved

shwstppr commented May 9, 2025

View reviewed changes

...a/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java Outdated Show resolved Hide resolved

Update plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervis…

bb60c88

…or/xenserver/resource/wrapper/xenbase/CitrixCleanupVMCommandWrapper.java

fix condition :facepalm

93686c7

Signed-off-by: Abhishek Kumar <[email protected]>

shwstppr marked this pull request as ready for review May 9, 2025 15:00

weizhouapache approved these changes May 10, 2025

View reviewed changes

Pearl1594 approved these changes May 12, 2025

View reviewed changes

harikrishna-patnala approved these changes May 12, 2025

View reviewed changes

Pearl1594 merged commit e68abcd into apache:4.19 May 12, 2025
25 of 26 checks passed

Pearl1594 deleted the xen-destoy-vmsonexpunge branch May 12, 2025 05:16

Pearl1594 added this to the 4.19.3 milestone May 12, 2025

Pearl1594 added this to ACS 4.20.1 May 12, 2025

Pearl1594 moved this to Done in ACS 4.20.1 May 12, 2025

dhslove pushed a commit to ablecloud-team/ablestack-cloud that referenced this pull request Jun 19, 2025

xenserver: destroy halted vm on expunge (apache#10833)

bdfb829

* xenserver: destroy halted vm on expunge Signed-off-by: Abhishek Kumar <[email protected]>

xenserver: destroy halted vm on expunge #10833

xenserver: destroy halted vm on expunge #10833

Uh oh!

Conversation

shwstppr commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

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!

shwstppr commented May 8, 2025

Uh oh!

blueorangutan commented May 8, 2025

Uh oh!

codecov bot commented May 8, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented May 8, 2025

Uh oh!

weizhouapache commented May 8, 2025

Uh oh!

blueorangutan commented May 8, 2025

Uh oh!

Uh oh!

Uh oh!

shwstppr commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

weizhouapache commented May 9, 2025

Uh oh!

weizhouapache commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

shwstppr commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

weizhouapache commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

weizhouapache commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

shwstppr commented May 9, 2025

Uh oh!

blueorangutan commented May 9, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented May 10, 2025

Uh oh!

blueorangutan commented May 10, 2025

Uh oh!

Pearl1594 left a comment

Choose a reason for hiding this comment

Uh oh!

harikrishna-patnala left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

shwstppr commented May 8, 2025 •

edited

Loading

codecov bot commented May 8, 2025 •

edited

Loading