Fix skip DRS for a VM by vishesh92 · Pull Request #12994 · apache/cloudstack

vishesh92 · 2026-04-10T06:45:58Z

Description

When a VM has skipFromDRS detail set, it is still not getting skipped. This PR fixes it.

Details

This pull request refactors how the system determines whether a VM should be skipped for DRS (Distributed Resource Scheduler) operations. The main improvement is centralizing and simplifying the skip logic, now using the `UserVmDetailsDao` to check VM details in the database rather than relying solely on in-memory details. This ensures more accurate and consistent behavior.

Key changes:

Refactoring skip logic for DRS:

Introduced a new shouldSkipVMForDRS method to encapsulate all logic for determining if a VM should be skipped, making the code cleaner and easier to maintain.
Updated the main DRS processing loop to use the new shouldSkipVMForDRS method, ensuring consistent skip checks throughout the codebase.

Improved VM detail retrieval:

Now retrieves the SKIP_DRS flag using UserVmDetailsDao from the database, instead of only checking the VM's in-memory details map. This makes the skip logic more robust and reliable.

Dependency injection:

Added dependency injection for UserVmDetailsDao to enable database access for VM details.
Imported UserVmDetailVO and UserVmDetailsDao for use in the new logic.

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?

server/src/main/java/org/apache/cloudstack/cluster/ClusterDrsServiceImpl.java

…erviceImpl.java Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

Copilot

Pull request overview

Note

Copilot was unable to run its full agentic suite in this review.

Fixes DRS skip behavior when the SKIP_DRS VM detail is set but not present in the in-memory VM details map by centralizing skip logic and consulting the DB-backed VM details DAO.

Changes:

Added DB-backed lookup of VmDetailConstants.SKIP_DRS via UserVmDetailsDao.
Centralized DRS skip logic into shouldSkipVMForDRS and reused it in both the main loop and skipDrs.

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

server/src/main/java/org/apache/cloudstack/cluster/ClusterDrsServiceImpl.java

codecov · 2026-04-10T07:12:28Z

Codecov Report

❌ Patch coverage is 38.09524% with 13 lines in your changes missing coverage. Please review.
✅ Project coverage is 16.26%. Comparing base (6f1aa96) to head (0a6803f).

Files with missing lines	Patch %	Lines
...udstack/resourcedetail/ResourceDetailsDaoBase.java	0.00%	12 Missing ⚠️
...ache/cloudstack/cluster/ClusterDrsServiceImpl.java	88.88%	0 Missing and 1 partial ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               4.20   #12994      +/-   ##
============================================
- Coverage     16.26%   16.26%   -0.01%     
+ Complexity    13434    13430       -4     
============================================
  Files          5665     5665              
  Lines        500530   500537       +7     
  Branches      60787    60780       -7     
============================================
+ Hits          81411    81412       +1     
- Misses       410028   410034       +6     
  Partials       9091     9091

Flag	Coverage Δ
uitests	`4.15% <ø> (ø)`
unittests	`17.11% <38.09%> (-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.

Copilot

Pull request overview

Copilot reviewed 4 out of 4 changed files in this pull request and generated 1 comment.

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

server/src/test/java/org/apache/cloudstack/cluster/ClusterDrsServiceImplTest.java

vishesh92 · 2026-04-10T08:06:09Z

@blueorangutan package

blueorangutan · 2026-04-10T08:08:04Z

@vishesh92 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-04-10T09:01:57Z

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

blueorangutan · 2026-04-10T09:37:44Z

[SF] Trillian Build Failed (tid-15852)

sureshanaparti · 2026-04-10T19:27:00Z

@blueorangutan test

blueorangutan · 2026-04-10T19:28:04Z

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

blueorangutan · 2026-04-11T11:09:00Z

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

Test	Result	Time (s)	Test File

sureshanaparti · 2026-04-13T11:12:45Z

server/src/main/java/org/apache/cloudstack/cluster/ClusterDrsServiceImpl.java

-                vm.getState() != VirtualMachine.State.Running ||
-                (MapUtils.isNotEmpty(vm.getDetails()) &&
-                 "true".equalsIgnoreCase(vm.getDetails().get(VmDetailConstants.SKIP_DRS)))) {
+            if (shouldSkipVMForDRS(vm, skipDrsVmIds)) {


@vishesh92 can we get and check the skip drs detail per vm, instead of getting the complete list, filtering and checking in them?

This is to reduce the database queries. Otherwise if we have 1000 VMs, we will be making 1000 queries for this.

assuming the vm object have details loaded already, isn't it so?

The VM object doesn't have details loaded by default. Because of this, the current code wasn't working.

kiranchavala

@vishesh92

As discussed, if we could add a log message saying we are skipping a vm from drs plan when "generateClusterDrsPlan" api is called it will be beneficial to the admin user when troubleshooting.

Also, please update the doc about the "skipFromDRS" in vmsettings

https://docs.cloudstack.apache.org/en/4.22.0.0/adminguide/clusters.html#cloudstack-drs

Fix skip DRS for a VM

537dd17

vishesh92 requested a review from Copilot April 10, 2026 06:46

sureshanaparti reviewed Apr 10, 2026

View reviewed changes

server/src/main/java/org/apache/cloudstack/cluster/ClusterDrsServiceImpl.java Outdated Show resolved Hide resolved

Update server/src/main/java/org/apache/cloudstack/cluster/ClusterDrsS…

e7e4e9d

…erviceImpl.java Co-authored-by: Suresh Kumar Anaparti <sureshkumar.anaparti@gmail.com>

apache deleted a comment from blueorangutan Apr 10, 2026

vishesh92 requested review from Copilot and removed request for Copilot April 10, 2026 06:52

Copilot AI reviewed Apr 10, 2026

View reviewed changes

Copilot started reviewing on behalf of vishesh92 April 10, 2026 07:10 View session

Copilot started reviewing on behalf of vishesh92 April 10, 2026 07:13 View session

Address comments & fix tests

0a6803f

vishesh92 requested a review from Copilot April 10, 2026 07:31

Copilot started reviewing on behalf of vishesh92 April 10, 2026 07:32 View session

Copilot AI reviewed Apr 10, 2026

View reviewed changes

server/src/test/java/org/apache/cloudstack/cluster/ClusterDrsServiceImplTest.java Show resolved Hide resolved

sureshanaparti reviewed Apr 13, 2026

View reviewed changes

kiranchavala reviewed Apr 13, 2026

View reviewed changes

Conversation

vishesh92 commented Apr 10, 2026 • 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!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Apr 10, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

vishesh92 commented Apr 10, 2026

Uh oh!

blueorangutan commented Apr 10, 2026

Uh oh!

blueorangutan commented Apr 10, 2026

Uh oh!

blueorangutan commented Apr 10, 2026

Uh oh!

sureshanaparti commented Apr 10, 2026

Uh oh!

blueorangutan commented Apr 10, 2026

Uh oh!

blueorangutan commented Apr 11, 2026

Uh oh!

sureshanaparti Apr 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

vishesh92 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

sureshanaparti Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

vishesh92 Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

kiranchavala left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

vishesh92 commented Apr 10, 2026 •

edited

Loading

codecov bot commented Apr 10, 2026 •

edited

Loading

sureshanaparti Apr 13, 2026 •

edited

Loading