Refactor of Allocator classes #9074

BryanMLima · 2024-05-10T20:49:48Z

Description

This PR refactors some *Allocator classes, improving modularity and code legibility. This PR also made some changes to logs across these classes.

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

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Major
Minor

How Has This Been Tested?

I tested the allocation process in my personal lab, using both the RandomAllocator and FirstFitAllocator allocators. I tried some variation of tags and offerings, and everything looks good. Furthermore, I also added a lot of unit tests for the methods that I refactored.

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

codecov · 2024-05-10T20:58:21Z

Codecov Report

Attention: Patch coverage is 80.89431% with 47 lines in your changes missing coverage. Please review.

Project coverage is 16.61%. Comparing base (41b4f0a) to head (a98abd2).

Files with missing lines	Patch %	Lines
...gent/manager/allocator/impl/FirstFitAllocator.java	79.71%	24 Missing and 4 partials ⚠️
.../agent/manager/allocator/impl/RandomAllocator.java	89.09%	6 Missing ⚠️
...agent/manager/allocator/impl/TestingAllocator.java	0.00%	3 Missing ⚠️
...om/cloud/deploy/DeploymentPlanningManagerImpl.java	62.50%	2 Missing and 1 partial ⚠️
...in/java/com/cloud/server/ManagementServerImpl.java	0.00%	3 Missing ⚠️
.../src/main/java/com/cloud/host/dao/HostDaoImpl.java	0.00%	2 Missing ⚠️
...i/command/admin/host/FindHostsForMigrationCmd.java	0.00%	1 Missing ⚠️
...loudstack/api/command/admin/host/ListHostsCmd.java	0.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #9074      +/-   ##
============================================
+ Coverage     16.57%   16.61%   +0.03%     
- Complexity    13870    13915      +45     
============================================
  Files          5719     5720       +1     
  Lines        507200   507124      -76     
  Branches      61574    61522      -52     
============================================
+ Hits          84093    84268     +175     
+ Misses       413688   413446     -242     
+ Partials       9419     9410       -9

Flag	Coverage Δ
uitests	`3.96% <ø> (ø)`
unittests	`17.49% <80.89%> (+0.03%)`	⬆️

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.

github-actions · 2024-06-19T04:16:42Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

github-actions · 2024-07-12T08:04:09Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

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

JoaoJandre

LGTM, I did some basic testing, changed the allocator to FirstFit and created some VMs, the VM allocation worked fine with and without tags. However, my tests were limited, further testing would be good.

DaanHoogland · 2024-08-26T08:11:09Z

@blueorangutan package

blueorangutan · 2024-08-26T08:12:03Z

@DaanHoogland 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 · 2024-08-26T09:30:59Z

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

DaanHoogland · 2024-08-26T13:06:42Z

@blueorangutan LLtest

BryanMLima · 2025-01-27T18:07:06Z

@blueorangutan package

blueorangutan · 2025-01-27T18:08:04Z

@BryanMLima 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-01-27T19:15:13Z

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

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

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

server/src/test/java/com/cloud/agent/manager/allocator/impl/BaseAllocatorTest.java

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

server/src/test/java/com/cloud/agent/manager/allocator/impl/RandomAllocatorTest.java

outdated

server/src/main/java/com/cloud/server/ManagementServerImpl.java

github-actions · 2025-04-22T07:37:08Z

This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.

…to-method

winterhazel · 2025-06-06T17:06:47Z

@blueorangutan package

blueorangutan · 2025-06-06T17:08:03Z

@winterhazel 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-06-06T17:17:43Z

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

winterhazel · 2025-06-06T17:28:23Z

@blueorangutan package

blueorangutan · 2025-06-06T17:30:03Z

@winterhazel 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-06-06T17:39:31Z

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

winterhazel · 2025-06-06T22:31:55Z

@blueorangutan package

blueorangutan · 2025-06-06T22:34:04Z

@winterhazel 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-06-06T23:40:46Z

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

github-actions bot added the status:has-conflicts label Jun 19, 2024

BryanMLima force-pushed the refactor-allocate-to-method branch from 1ff8f4a to 42d16d9 Compare July 11, 2024 15:47

boring-cyborg bot added component:api component:build component:compute component:management-server component:orchestration labels Jul 11, 2024

github-actions bot added status:has-conflicts and removed status:has-conflicts labels Jul 11, 2024

BryanMLima force-pushed the refactor-allocate-to-method branch from 537c10f to 952c273 Compare July 15, 2024 13:26

github-actions bot removed the status:has-conflicts label Jul 15, 2024

BryanMLima changed the title ~~Refactoring FirstFitAllocator class~~ Refactoring Allocator classes Jul 15, 2024

BryanMLima marked this pull request as ready for review July 15, 2024 13:44

BryanMLima changed the title ~~Refactoring Allocator classes~~ Refactor of Allocator classes Jul 15, 2024

BryanMLima requested review from JoaoJandre and DaanHoogland and removed request for JoaoJandre July 15, 2024 13:45

DaanHoogland reviewed Jul 15, 2024

View reviewed changes

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

JoaoJandre approved these changes Jul 18, 2024

View reviewed changes

BryanMLima force-pushed the refactor-allocate-to-method branch 2 times, most recently from dd1eb14 to 952c273 Compare July 24, 2024 14:28

BryanMLima force-pushed the refactor-allocate-to-method branch from 952c273 to b7cc66f Compare August 23, 2024 19:11

BryanMLima force-pushed the refactor-allocate-to-method branch from 1e91276 to d0e5efd Compare January 27, 2025 18:05

github-actions bot removed the status:has-conflicts label Jan 27, 2025

winterhazel requested changes Feb 13, 2025

View reviewed changes

winterhazel requested changes Feb 15, 2025

View reviewed changes

DaanHoogland requested review from DaanHoogland and removed request for DaanHoogland February 15, 2025 14:56

winterhazel requested changes Feb 21, 2025

View reviewed changes

server/src/main/java/com/cloud/server/ManagementServerImpl.java Show resolved Hide resolved

github-actions bot added the status:has-conflicts label Apr 22, 2025

sureshanaparti added this to Apache CloudStack 4.21.0 Jun 5, 2025

sureshanaparti moved this to In Progress in Apache CloudStack 4.21.0 Jun 5, 2025

Fabricio Duarte added 3 commits June 6, 2025 08:49

Fix flipped parameters

84bd297

Fix NPE while listing hosts for migration when suitableHosts is null

d95c238

Merge remote-tracking branch 'community/main' into refactor-allocate-…

1eea281

…to-method

github-actions bot removed the status:has-conflicts label Jun 6, 2025

Remove unnecessary stubbings

94ee342

Fix checkstyle

a98abd2

Refactor of Allocator classes #9074

Are you sure you want to change the base?

Refactor of Allocator classes #9074

Uh oh!

Conversation

BryanMLima commented May 10, 2024 • 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

How Has This Been Tested?

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

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Jun 19, 2024

Uh oh!

github-actions bot commented Jul 12, 2024

Uh oh!

Uh oh!

JoaoJandre left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Aug 26, 2024

Uh oh!

blueorangutan commented Aug 26, 2024

Uh oh!

blueorangutan commented Aug 26, 2024

Uh oh!

DaanHoogland commented Aug 26, 2024

Uh oh!

BryanMLima commented Jan 27, 2025

Uh oh!

blueorangutan commented Jan 27, 2025

Uh oh!

blueorangutan commented Jan 27, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Apr 22, 2025

Uh oh!

winterhazel commented Jun 6, 2025

Uh oh!

blueorangutan commented Jun 6, 2025

Uh oh!

blueorangutan commented Jun 6, 2025

Uh oh!

winterhazel commented Jun 6, 2025

Uh oh!

blueorangutan commented Jun 6, 2025

Uh oh!

blueorangutan commented Jun 6, 2025

Uh oh!

winterhazel commented Jun 6, 2025

Uh oh!

blueorangutan commented Jun 6, 2025

Uh oh!

blueorangutan commented Jun 6, 2025

Uh oh!

Uh oh!

BryanMLima commented May 10, 2024 •

edited

Loading

codecov bot commented May 10, 2024 •

edited

Loading