Fix listing service offerings with different host tags by nvazquez · Pull Request #12919 · apache/cloudstack

nvazquez · 2026-03-30T18:31:15Z

Description

This PR fixes the listing of service offerings for VMs, including offerings that contain different host tags. Previously only offerings without any host tag or offerings matching exactly the same VM offering host tags were displayed

Fixes: #11407

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?

Create service offering A with host tag = TAG_A
Create service offering B with host tag = TAG_B
Edit hosts, some using tag TAG_A and some using TAG_B
Deploy VM from service offering A
Stop VM
Click on Scale VM, observe that offering B is available, select offering B
VM is properly scaled to use offering B

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

nvazquez · 2026-03-30T18:32:23Z

@blueorangutan package

blueorangutan · 2026-03-30T18:34:04Z

@nvazquez 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 · 2026-03-30T18:41:17Z

Codecov Report

❌ Patch coverage is 48.38710% with 16 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.60%. Comparing base (59b6c32) to head (7742df2).

Files with missing lines	Patch %	Lines
...ain/java/com/cloud/api/query/QueryManagerImpl.java	52.38%	6 Missing and 4 partials ⚠️
.../main/java/com/cloud/host/dao/HostTagsDaoImpl.java	40.00%	6 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               4.22   #12919   +/-   ##
=========================================
  Coverage     17.60%   17.60%           
- Complexity    15676    15678    +2     
=========================================
  Files          5918     5918           
  Lines        531667   531697   +30     
  Branches      65001    65005    +4     
=========================================
+ Hits          93617    93631   +14     
- Misses       427491   427502   +11     
- Partials      10559    10564    +5

Flag	Coverage Δ
uitests	`3.70% <ø> (ø)`
unittests	`18.68% <48.38%> (+<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 · 2026-03-30T19:34:21Z

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

Copilot

Pull request overview

This PR updates service offering listing logic (used for VM scaling) so that offerings with different host tags are also shown, by expanding the tag filter to include tags present on hosts in the VM’s current cluster and by loosening host-tag matching to OR semantics.

Changes:

Extend service offering filtering to include host tags from the VM’s current cluster when listing scale-eligible offerings.
Change host-tag matching from requiring all tags (AND) to allowing any matching tag (OR), while still including untagged offerings.
Add unit tests for collecting cluster host tags into the VM’s host tag filter.

Reviewed changes

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

File	Description
`server/src/main/java/com/cloud/api/query/QueryManagerImpl.java`	Expands host-tag filtering for service offering listing and adds helper to include cluster tags.
`engine/schema/src/main/java/com/cloud/host/dao/HostTagsDao.java`	Adds DAO API to list host tags by cluster ID.
`engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java`	Implements listing tags by cluster via host IDs + custom search.
`server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java`	Adds tests for the new helper that augments host tags with current cluster tags.

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

Copilot · 2026-03-30T21:45:02Z

engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java

+        SearchCriteria<String> sc = tagSearch.create();
+        sc.setParameters("idIN", hostIds.toArray());


listByClusterId is filtering HostTagVO by the tag record primary key (getId()) instead of the host foreign key (getHostId()). Since you pass host IDs from hostDao.listIdsByClusterId, this will return incorrect results (often empty, or wrong tags if IDs happen to overlap). Update the search builder/criteria to use host_id IN (...) (and ideally select DISTINCT tags).

Suggested change

SearchCriteria<String> sc = tagSearch.create();

sc.setParameters("idIN", hostIds.toArray());

if (hostIds == null || hostIds.isEmpty()) {

return new ArrayList<>();

}

GenericSearchBuilder<HostTagVO, String> sb = createSearchBuilder(String.class);

sb.select(null, Func.DISTINCT, sb.entity().getTag());

sb.and("hostIdIN", sb.entity().getHostId(), SearchCriteria.Op.IN);

sb.done();

SearchCriteria<String> sc = sb.create();

sc.setParameters("hostIdIN", hostIds.toArray());

Copilot · 2026-03-30T21:45:02Z

engine/schema/src/main/java/com/cloud/host/dao/HostTagsDaoImpl.java

+    public List<String> listByClusterId(Long clusterId) {
+        List<Long> hostIds = hostDao.listIdsByClusterId(clusterId);
+        SearchCriteria<String> sc = tagSearch.create();
+        sc.setParameters("idIN", hostIds.toArray());
+        return customSearch(sc, null);
+    }


listByClusterId should defensively handle an empty host list from hostDao.listIdsByClusterId(clusterId). Passing an empty array into an IN criterion can produce invalid SQL (or at best an unnecessary query). Consider returning an empty list early when hostIds is null/empty, and ensure the query returns distinct tags to avoid duplicates from multiple hosts.

Copilot · 2026-03-30T21:45:03Z

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

+        }
+        Set<String> existingTagsSet = new HashSet<>(hostTags);
+        clusterTags.stream()
+                .filter(tag -> !existingTagsSet.contains(tag))


addVmCurrentClusterHostTags can add duplicate tags if clusterTags contains repeats (e.g., multiple hosts in the cluster share the same tag). This can cause redundant/duplicated hostTag... criteria names later when building the search (and at minimum makes the query larger than needed). Consider de-duplicating clusterTags (e.g., distinct() / Set) and/or updating existingTagsSet as tags are added.

Suggested change

.filter(tag -> !existingTagsSet.contains(tag))

.filter(tag -> !existingTagsSet.contains(tag))

.peek(existingTagsSet::add)

Copilot · 2026-03-30T21:45:03Z

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

+        }
+        List<String> clusterTags = _hostTagDao.listByClusterId(host.getClusterId());
+        if (CollectionUtils.isEmpty(clusterTags)) {
+            logger.warn("No host tags defined for hosts in the cluster " + host.getClusterId());


Logging "No host tags defined for hosts in the cluster ..." at WARN is likely to be noisy in normal environments (many clusters/hosts may be intentionally untagged, and this method can be invoked frequently when listing offerings). Consider lowering this to DEBUG/INFO, or logging only when host tags are actually required for the request.

Suggested change

logger.warn("No host tags defined for hosts in the cluster " + host.getClusterId());

logger.debug("No host tags defined for hosts in the cluster " + host.getClusterId());

Fix listing service offerings with different host tags

7742df2

nvazquez requested review from Damans227, Pearl1594, abh1sar, harikrishna-patnala, kiranchavala, sureshanaparti and weizhouapache March 30, 2026 18:31

nvazquez added component:UI component:tagging labels Mar 30, 2026

nvazquez linked an issue Mar 30, 2026 that may be closed by this pull request

Ability to change compute offering with different host tags #11407

Open

nvazquez requested review from DaanHoogland and shwstppr March 30, 2026 18:36

weizhouapache requested a review from Copilot March 30, 2026 21:40

Copilot started reviewing on behalf of weizhouapache March 30, 2026 21:40 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix listing service offerings with different host tags#12919

Fix listing service offerings with different host tags#12919
nvazquez wants to merge 1 commit intoapache:4.22from
shapeblue:422-change-offering-hosttags

nvazquez commented Mar 30, 2026

Uh oh!

nvazquez commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

codecov bot commented Mar 30, 2026 •

edited

Loading

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		SearchCriteria<String> sc = tagSearch.create();
		sc.setParameters("idIN", hostIds.toArray());

-        SearchCriteria<String> sc = tagSearch.create();
-        sc.setParameters("idIN", hostIds.toArray());
+        if (hostIds == null || hostIds.isEmpty()) {
+            return new ArrayList<>();
+        }
+        GenericSearchBuilder<HostTagVO, String> sb = createSearchBuilder(String.class);
+        sb.select(null, Func.DISTINCT, sb.entity().getTag());
+        sb.and("hostIdIN", sb.entity().getHostId(), SearchCriteria.Op.IN);
+        sb.done();
+        SearchCriteria<String> sc = sb.create();
+        sc.setParameters("hostIdIN", hostIds.toArray());

	.filter(tag -> !existingTagsSet.contains(tag))
	.filter(tag -> !existingTagsSet.contains(tag))
	.peek(existingTagsSet::add)

	logger.warn("No host tags defined for hosts in the cluster " + host.getClusterId());
	logger.debug("No host tags defined for hosts in the cluster " + host.getClusterId());

Conversation

nvazquez commented Mar 30, 2026

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!

nvazquez commented Mar 30, 2026

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

blueorangutan commented Mar 30, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

codecov bot commented Mar 30, 2026 •

edited

Loading