server: fix available hypervisors listing for a zone by shwstppr · Pull Request #10738 · apache/cloudstack

shwstppr · Apr 16, 2025

Description

In the absence of a SYSTEM type template for a zone, listing of templates can break.
Behaviour was change in #9840 but it would be better to find available hypervisors using existing hosts.

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?

In the absence of a SYSTEM type template for a zone, listing of templates can break. Behaviour was change in apache#9840 but it would be better to find available hypervisors using existing hosts.

shwstppr · Apr 16, 2025

@blueorangutan package

blueorangutan · Apr 16, 2025

@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 · Apr 16, 2025

Codecov Report

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

Project coverage is 16.02%. Comparing base (a09354d) to head (4c6aa55).
Report is 23 commits behind head on 4.20.

Files with missing lines	Patch %	Lines
...n/java/com/cloud/resource/ResourceManagerImpl.java	0.00%	6 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.20   #10738   +/-   ##
=========================================
  Coverage     16.01%   16.02%           
  Complexity    13123    13123           
=========================================
  Files          5652     5652           
  Lines        495921   495921           
  Branches      60053    60053           
=========================================
+ Hits          79446    79451    +5     
+ Misses       407611   407607    -4     
+ Partials       8864     8863    -1

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

yadvr · Apr 16, 2025

Re-kicking smoketests in Github Actions.

@blueorangutan package

blueorangutan · Apr 16, 2025

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

weizhouapache

I remember there is a similar method, so looked for it

cloudstack/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java

Lines 168 to 178 in 55c8115

    
           public List<HypervisorType> getAvailableHypervisorInZone(Long zoneId) { 
        
               SearchCriteria<ClusterVO> sc = AvailHyperSearch.create(); 
        
               if (zoneId != null) { 
        
                   sc.setParameters("zoneId", zoneId); 
        
               } 
        
               List<ClusterVO> clusters = listBy(sc); 
        
               return clusters.stream() 
        
                       .map(ClusterVO::getHypervisorType) 
        
                       .distinct() 
        
                       .collect(Collectors.toList()); 
        
           }

blueorangutan · Apr 16, 2025

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

blueorangutan · Apr 16, 2025

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

DaanHoogland · Apr 16, 2025

I remember there is a similar method, so looked for it

cloudstack/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java

Lines 168 to 178 in 55c8115

public List<HypervisorType> getAvailableHypervisorInZone(Long zoneId) {

SearchCriteria<ClusterVO> sc = AvailHyperSearch.create();

if (zoneId != null) {

sc.setParameters("zoneId", zoneId);

}

List<ClusterVO> clusters = listBy(sc);

return clusters.stream()

.map(ClusterVO::getHypervisorType)

.distinct()

.collect(Collectors.toList());

}

nice find @weizhouapache , do you mean we should make a template method?

yadvr · Apr 17, 2025

@shwstppr can you review and fix the build/CI failures?

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · Apr 17, 2025

I remember there is a similar method, so looked for it

cloudstack/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java

Lines 168 to 178 in 55c8115

public List<HypervisorType> getAvailableHypervisorInZone(Long zoneId) {

SearchCriteria<ClusterVO> sc = AvailHyperSearch.create();

if (zoneId != null) {

sc.setParameters("zoneId", zoneId);

}

List<ClusterVO> clusters = listBy(sc);

return clusters.stream()

.map(ClusterVO::getHypervisorType)

.distinct()

.collect(Collectors.toList());

}

@weizhouapache are you suggesting using ClusterDao method here or in the callers itself?

shwstppr · Apr 17, 2025

@blueorangutan package

blueorangutan · Apr 17, 2025

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

weizhouapache · Apr 17, 2025

I remember there is a similar method, so looked for it

cloudstack/engine/schema/src/main/java/com/cloud/dc/dao/ClusterDaoImpl.java

Lines 168 to 178 in 55c8115

public List<HypervisorType> getAvailableHypervisorInZone(Long zoneId) {

SearchCriteria<ClusterVO> sc = AvailHyperSearch.create();

if (zoneId != null) {

sc.setParameters("zoneId", zoneId);

}

List<ClusterVO> clusters = listBy(sc);

return clusters.stream()

.map(ClusterVO::getHypervisorType)

.distinct()

.collect(Collectors.toList());

}

@weizhouapache are you suggesting using ClusterDao method here or in the callers itself?

if the method returns the same result, we can use it.
the code can be simple as

    @Override
    public List<HypervisorType> listAvailHypervisorInZone(final Long zoneId) {
        return _clusterDao.getAvailableHypervisorInZone(zoneId);
    }

if there is a cluster without any host, then the results will be different ..

blueorangutan · Apr 17, 2025

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

shwstppr · Apr 17, 2025

Thanks @weizhouapache . It seems HostDao and ClusterDao can return different results. Maybe we can have a separate refactor to consolidate this or should I make the change here to use ClusterDao?

shwstppr · Apr 21, 2025

@blueorangutan test

blueorangutan · Apr 21, 2025

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

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

blueorangutan · Apr 22, 2025

[SF] Trillian test result (tid-13072)
Environment: kvm-ol8 (x2), Advanced Networking with Mgmt server ol8
Total time taken: 51906 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr10738-t13072-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

weizhouapache

code lgtm

sureshanaparti

clgtm

vladimirpetrov

LGTM based on manual testing

DaanHoogland · Apr 23, 2025

@shwstppr , this looks ready to merge, do you feel it is ready?

shwstppr · Apr 23, 2025

@DaanHoogland yes. Marked it ready for review

* server: fix available hypervisors listing for a zone In the absence of a SYSTEM type template for a zone, listing of templates can break. Behaviour was change in apache#9840 but it would be better to find available hypervisors using existing hosts. * fix Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com> --------- Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

server: fix available hypervisors listing for a zone

7188f28

In the absence of a SYSTEM type template for a zone, listing of templates can break. Behaviour was change in apache#9840 but it would be better to find available hypervisors using existing hosts.

yadvr added this to the 4.20.1 milestone Apr 16, 2025

yadvr requested review from nvazquez, sureshanaparti and weizhouapache April 16, 2025 12:42

yadvr approved these changes Apr 16, 2025

View reviewed changes

yadvr requested a review from DaanHoogland April 16, 2025 12:43

yadvr closed this Apr 16, 2025

yadvr reopened this Apr 16, 2025

weizhouapache reviewed Apr 16, 2025

View reviewed changes

fix

4c6aa55

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

sureshanaparti reviewed Apr 21, 2025

View reviewed changes

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java Show resolved Hide resolved

weizhouapache approved these changes Apr 22, 2025

View reviewed changes

sureshanaparti approved these changes Apr 22, 2025

View reviewed changes

vladimirpetrov approved these changes Apr 23, 2025

View reviewed changes

shwstppr marked this pull request as ready for review April 23, 2025 20:26

yadvr merged commit 603cd84 into apache:4.20 Apr 24, 2025
25 of 26 checks passed

yadvr deleted the fix-resourcemgr-hyplist branch April 24, 2025 04:22

	public List<HypervisorType> getAvailableHypervisorInZone(Long zoneId) {
	SearchCriteria<ClusterVO> sc = AvailHyperSearch.create();
	if (zoneId != null) {
	sc.setParameters("zoneId", zoneId);
	}
	List<ClusterVO> clusters = listBy(sc);
	return clusters.stream()
	.map(ClusterVO::getHypervisorType)
	.distinct()
	.collect(Collectors.toList());
	}

Search code, repositories, users, issues, pull requests...

Conversation

shwstppr commented Apr 16, 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!

shwstppr commented Apr 16, 2025

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

yadvr commented Apr 16, 2025

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

blueorangutan commented Apr 16, 2025

Uh oh!

DaanHoogland commented Apr 16, 2025

Uh oh!

yadvr commented Apr 17, 2025

Uh oh!

shwstppr commented Apr 17, 2025

Uh oh!

shwstppr commented Apr 17, 2025

Uh oh!

blueorangutan commented Apr 17, 2025

Uh oh!

weizhouapache commented Apr 17, 2025

Uh oh!

blueorangutan commented Apr 17, 2025

Uh oh!

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

Uh oh!

Uh oh!

shwstppr commented Apr 21, 2025

Uh oh!

blueorangutan commented Apr 21, 2025

Uh oh!

Uh oh!

blueorangutan commented Apr 22, 2025

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

sureshanaparti left a comment

Choose a reason for hiding this comment

Uh oh!

vladimirpetrov left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented Apr 23, 2025

Uh oh!

shwstppr commented Apr 23, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

codecov bot commented Apr 16, 2025 •

edited

Loading

shwstppr commented Apr 17, 2025 •

edited

Loading