Fix issue with allocator not considering subsequent clusters #10603

Pearl1594 · 2025-03-21T11:48:03Z

Description

This PR fixes: #10598
While #8611 seems to have fixed this issue in 4.19.1, I believe it got lost in the process of resolving merge conflicts / forward merging into 4.20.0.

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?

codecov · 2025-03-21T11:53:40Z

Codecov Report

Attention: Patch coverage is 0% with 10 lines in your changes missing coverage. Please review.

Project coverage is 16.01%. Comparing base (653b973) to head (0977c5c).
Report is 46 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
.../agent/manager/allocator/impl/RandomAllocator.java	0.00%	6 Missing ⚠️
...gent/manager/allocator/impl/FirstFitAllocator.java	0.00%	4 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #10603   +/-   ##
=========================================
  Coverage     16.00%   16.01%           
- Complexity    13104    13118   +14     
=========================================
  Files          5651     5651           
  Lines        495870   495895   +25     
  Branches      60049    60057    +8     
=========================================
+ Hits          79370    79422   +52     
+ Misses       407638   407617   -21     
+ Partials       8862     8856    -6

Flag	Coverage Δ
uitests	`4.00% <ø> (ø)`
unittests	`16.85% <0.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.

server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java

weizhouapache · 2025-03-21T12:38:29Z

oh, check-style error

Error:  /home/runner/work/cloudstack/cloudstack/server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java:28:8: Unused import - com.cloud.utils.exception.CloudRuntimeException. [UnusedImports]

weizhouapache · 2025-03-21T13:06:13Z

@blueorangutan package

blueorangutan · 2025-03-21T13:08:03Z

@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-03-21T14:20:45Z

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

weizhouapache · 2025-03-21T15:20:42Z

@blueorangutan test

blueorangutan · 2025-03-21T15:22:04Z

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

blueorangutan · 2025-03-21T16:02:54Z

[SF] Trillian Build Failed (tid-12800)

weizhouapache · 2025-03-21T16:37:10Z

@blueorangutan test

blueorangutan · 2025-03-21T16:38:03Z

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

blueorangutan · 2025-03-22T09:37:07Z

[SF] Trillian test result (tid-12801)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 58506 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10603-t12801-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_02_restore_vm_strict_tags_failure	`Failure`	56.38	test_vm_strict_host_tags.py
test_02_scale_vm_strict_tags_failure	`Failure`	64.69	test_vm_strict_host_tags.py
test_06_deploy_vm_on_any_host_with_strict_tags_failure	`Failure`	5.64	test_vm_strict_host_tags.py

...-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java

server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java

...-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java

sonarqubecloud · 2025-03-25T21:11:51Z

Quality Gate passed

Issues
1 New issue
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

shwstppr

Code LGTM

weizhouapache

code lgtm

DaanHoogland

clgtm

Pearl1594 · 2025-03-27T15:44:09Z

@blueorangutan package

blueorangutan · 2025-03-27T15:46:04Z

@Pearl1594 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-03-27T16:48:36Z

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

Pearl1594 · 2025-03-28T15:59:52Z

@blueorangutan test

blueorangutan · 2025-03-28T16:02:04Z

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

blueorangutan · 2025-03-29T08:27:26Z

[SF] Trillian test result (tid-12847)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 56306 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10603-t12847-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_02_restore_vm_strict_tags_failure	`Failure`	53.37	test_vm_strict_host_tags.py
test_02_scale_vm_strict_tags_failure	`Failure`	54.44	test_vm_strict_host_tags.py
test_06_deploy_vm_on_any_host_with_strict_tags_failure	`Failure`	5.72	test_vm_strict_host_tags.py

…10603) * Fix issue with allocator not considering subsequent clusters * add missing return * remove unused import * update as per inputs

Fix issue with allocator not considering subsequent clusters

154743a

Pearl1594 requested review from DaanHoogland, JoaoJandre, shwstppr and weizhouapache March 21, 2025 11:48

Pearl1594 linked an issue Mar 21, 2025 that may be closed by this pull request

FirstFitRouting Allocator only tries the first cluster it finds then fails before attempting others #10598

Closed

Pearl1594 added this to ACS 4.20.1 Mar 21, 2025

Pearl1594 moved this to In Progress in ACS 4.20.1 Mar 21, 2025

weizhouapache reviewed Mar 21, 2025

View reviewed changes

server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java Show resolved Hide resolved

add missing return

63f659c

remove unused import

d879560

shwstppr reviewed Mar 24, 2025

View reviewed changes

...-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java Show resolved Hide resolved

DaanHoogland reviewed Mar 24, 2025

View reviewed changes

server/src/main/java/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java Show resolved Hide resolved

...-allocators/random/src/main/java/com/cloud/agent/manager/allocator/impl/RandomAllocator.java Show resolved Hide resolved

update as per inputs

0977c5c

shwstppr approved these changes Mar 26, 2025

View reviewed changes

weizhouapache approved these changes Mar 26, 2025

View reviewed changes

DaanHoogland approved these changes Mar 26, 2025

View reviewed changes

vishesh92 mentioned this pull request Apr 18, 2025

FirstFitRouting Allocator only tries the first cluster it finds then fails before attempting others #10598

Closed

Pearl1594 merged commit 0da243d into 4.20 Apr 22, 2025
48 of 50 checks passed

github-project-automation bot moved this from In Progress to Done in ACS 4.20.1 Apr 22, 2025

vishesh92 deleted the fix-allocator-logic branch April 23, 2025 07:45

Pearl1594 mentioned this pull request May 2, 2025

smoke tests / CI : Fix test_vm_stric_host_tags #10806

Merged

14 tasks

Fix issue with allocator not considering subsequent clusters #10603

Fix issue with allocator not considering subsequent clusters #10603

Uh oh!

Conversation

Pearl1594 commented Mar 21, 2025

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!

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

Uh oh!

Codecov Report

Uh oh!

Uh oh!

weizhouapache commented Mar 21, 2025

Uh oh!

weizhouapache commented Mar 21, 2025

Uh oh!

blueorangutan commented Mar 21, 2025

Uh oh!

blueorangutan commented Mar 21, 2025

Uh oh!

weizhouapache commented Mar 21, 2025

Uh oh!

blueorangutan commented Mar 21, 2025

Uh oh!

blueorangutan commented Mar 21, 2025

Uh oh!

weizhouapache commented Mar 21, 2025

Uh oh!

blueorangutan commented Mar 21, 2025

Uh oh!

blueorangutan commented Mar 22, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

sonarqubecloud bot commented Mar 25, 2025

Quality Gate passed

Uh oh!

shwstppr left a comment

Choose a reason for hiding this comment

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Pearl1594 commented Mar 27, 2025

Uh oh!

blueorangutan commented Mar 27, 2025

Uh oh!

blueorangutan commented Mar 27, 2025

Uh oh!

Pearl1594 commented Mar 28, 2025

Uh oh!

blueorangutan commented Mar 28, 2025

Uh oh!

blueorangutan commented Mar 29, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

codecov bot commented Mar 21, 2025 •

edited

Loading