Batch VM and host lookups in StorageManagerImpl to eliminate N+1 queries during cleanup and pool connect by vishesh92 · Pull Request #13353 · apache/cloudstack

vishesh92 · 2026-06-05T09:03:37Z

Description

cleanupStorage: replaced per-volume _vmInstanceDao.findById(vol.getInstanceId()) with a single batch SELECT ... WHERE id IN (...) before the loop, using a HashMap for O(1) lookups. Added null guard for volumes with null instanceId.

connectHostsToPool: replaced per-thread _hostDao.findById(hostId) with a batch load before thread pool submission. Each thread now reads from a pre-built HashMap instead of hitting the DB. Added null guard with warning log for hosts removed between list assembly and batch read.

Added VMInstanceDao.listByIds(List) with empty-list guard and IN-clause SearchBuilder, matching the established pattern in HostDao.

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?

vishesh92 · 2026-06-05T09:04:48Z

@blueorangutan package

blueorangutan · 2026-06-05T09:06:04Z

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

codecov · 2026-06-05T09:12:27Z

Codecov Report

❌ Patch coverage is 28.57143% with 20 lines in your changes missing coverage. Please review.
✅ Project coverage is 17.67%. Comparing base (a951ac6) to head (bc01b67).
⚠️ Report is 26 commits behind head on 4.22.

Files with missing lines	Patch %	Lines
.../main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java	0.00%	10 Missing ⚠️
...ain/java/com/cloud/storage/StorageManagerImpl.java	44.44%	10 Missing ⚠️

Additional details and impacted files

@@ Coverage Diff @@## 4.22 #13353 +/- ##
=========================================
Coverage 17.67% 17.67% Complexity 15797 15797 =========================================
Files 5923 5923 Lines 533349 533375 +26 Branches 65248 65252 +4 =========================================
+ Hits 94253 94262 +9 - Misses 428437 428453 +16 - Partials 10659 10660 +1

Flag	Coverage Δ
uitests	`3.69% <ø> (ø)`
unittests	`18.74% <28.57%> (+<0.01%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Harness.
📢 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.

vishesh92 · 2026-06-08T12:44:06Z

@blueorangutan package

blueorangutan · 2026-06-08T12:46:04Z

@vishesh92 a [SL] Jenkins job has been kicked to build packages. It will be bundled with no SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2026-06-08T13:35:35Z

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

vishesh92 · 2026-06-08T13:46:57Z

@blueorangutan test

blueorangutan · 2026-06-08T13:48:04Z

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

blueorangutan · 2026-06-09T08:30:55Z

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

Test	Result	Time (s)	Test File
ContextSuite context=TestVPCConserveModeRules>:setup	`Error`	0.00	test_vpc_conserve_mode.py
ContextSuite context=TestIpv6Vpc>:setup	`Error`	0.00	test_vpc_ipv6.py
ContextSuite context=TestVPCRedundancy>:setup	`Error`	0.00	test_vpc_redundant.py
ContextSuite context=TestVPCNics>:setup	`Error`	0.00	test_vpc_router_nics.py
ContextSuite context=TestRVPCSite2SiteVpn>:setup	`Error`	0.00	test_vpc_vpn.py
ContextSuite context=TestVPCSite2SiteVPNMultipleOptions>:setup	`Error`	0.00	test_vpc_vpn.py
ContextSuite context=TestVpcRemoteAccessVpn>:setup	`Error`	0.00	test_vpc_vpn.py
ContextSuite context=TestVpcSite2SiteVpn>:setup	`Error`	0.00	test_vpc_vpn.py
test_disable_oobm_ha_state_ineligible	`Error`	1517.95	test_hostha_kvm.py

weizhouapache · 2026-06-29T12:51:50Z

@vishesh92
can you rebase it with 4.22 ?

Copilot

Pull request overview

This PR reduces database N+1 lookup patterns in StorageManagerImpl by batching VM and host loads during storage cleanup and host-to-pool connection flows, and adds a VMInstanceDao.listByIds(...) helper to support that.

Changes:

Batch-load HostVO records before submitting pool-connection worker tasks, avoiding per-host DAO lookups.
Batch-load VMInstanceVO records for ROOT volumes during cleanupStorage, avoiding per-volume DAO lookups and adding null guards.
Add VMInstanceDao.listByIds(List<Long>) implementation and adjust related unit tests to match the new DAO access pattern.

Reviewed changes

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

Show a summary per file

File	Description
`server/src/main/java/com/cloud/storage/StorageManagerImpl.java`	Replaces per-item DAO lookups with batch loads + map lookups in cleanup and pool connect paths.
`engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java`	Adds `listByIds` query helper to enable batch VM fetches.
`engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java`	Exposes `listByIds` on the DAO interface.
`plugins/storage/volume/scaleio/src/test/java/org/apache/cloudstack/storage/datastore/lifecycle/ScaleIOPrimaryDataStoreLifeCycleTest.java`	Updates tests impacted by the new batching behavior in `connectHostsToPool`.
`plugins/storage/volume/default/src/test/java/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java`	Adds test stubbing for `HostDao.listByIds` used by the new batching logic.

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

+ public void testAttachZone() {
 final DataStore dataStore = mock(DataStore.class);
- when(dataStore.getId()).thenReturn(1L);

 MockedStatic<ScaleIOGatewayClientConnectionPool> scaleIOGatewayClientConnectionPoolMocked = mockStatic(ScaleIOGatewayClientConnectionPool.class);


 Mockito.when(host1.getId()).thenReturn(1L);
 Mockito.when(host2.getId()).thenReturn(2L);

 when(resourceManager.getEligibleUpAndEnabledHostsInZoneForStorageConnection(dataStore, scope.getScopeId(), Hypervisor.HypervisorType.KVM))
 .thenReturn(Arrays.asList(host1, host2));


+ public List<VMInstanceVO> listByIds(List<Long> ids) {
+ if (ids == null || ids.isEmpty()) {
+ return new ArrayList<>();
+ }


nvazquez

Thanks @vishesh92 - can you please rebase to branch 4.22? Can you also check if the Copilot comments are applicable?

…ies during cleanup and pool connect cleanupStorage: replaced per-volume _vmInstanceDao.findById(vol.getInstanceId()) with a single batch SELECT ... WHERE id IN (...) before the loop, using a HashMap for O(1) lookups. Added null guard for volumes with null instanceId. connectHostsToPool: replaced per-thread _hostDao.findById(hostId) with a batch load before thread pool submission. Each thread now reads from a pre-built HashMap instead of hitting the DB. Added null guard with warning log for hosts removed between list assembly and batch read. Added VMInstanceDao.listByIds(List<Long>) with empty-list guard and IN-clause SearchBuilder, matching the established pattern in HostDao.

boring-cyborgBot added the component:storage label Jun 5, 2026

github-actionsBot mentioned this pull request Jun 5, 2026
[repo-status] Daily Status Report – June 5, 2026 #13360
Closed

github-actionsBot added status:has-conflicts and removed status:has-conflicts labels Jun 8, 2026

vishesh92 force-pushed the batch-vm-host-lookups branch from c8a1b22 to ed025d2Compare June 8, 2026 11:05

boring-cyborgBot added the component:primary-storage label Jun 8, 2026

vishesh92 force-pushed the batch-vm-host-lookups branch 2 times, most recently from dad9933 to d867216Compare June 8, 2026 12:43

apache deleted a comment from blueorangutan Jun 8, 2026

apache deleted a comment from github-actionsBotJun 8, 2026

github-actionsBot mentioned this pull request Jun 8, 2026
[repo-status] Daily Status Report – June 8, 2026 #13381
Closed

weizhouapache added this to the 4.22.2 milestone Jun 29, 2026

sureshanaparti requested a review from Copilot July 6, 2026 10:57

Copilotstarted reviewing on behalf of sureshanaparti July 6, 2026 10:57 View session

CopilotAI reviewed Jul 6, 2026
View reviewed changes

sureshanaparti marked this pull request as ready for review July 7, 2026 10:44

sureshanaparti requested a review from nvazquez July 7, 2026 10:46

nvazquez reviewed Jul 7, 2026
View reviewed changes

sliceofapplepieand others added 2 commits July 7, 2026 17:22

Fix test failures
bc01b67

vishesh92 force-pushed the batch-vm-host-lookups branch from d867216 to bc01b67Compare July 7, 2026 11:52

DaanHoogland removed component:kvm component:management-server component:XenServer component:vmware component:primary-storage component:secondary-storage component:ipv6 component:vpc component:virtual-router component:console-proxy component:ssvm component:api labels Jul 13, 2026

Navigation Menu

Uh oh!

Batch VM and host lookups in StorageManagerImpl to eliminate N+1 queries during cleanup and pool connect - #13353

Batch VM and host lookups in StorageManagerImpl to eliminate N+1 queries during cleanup and pool connect#13353
vishesh92 wants to merge 2 commits into
apache:4.22from
shapeblue:batch-vm-host-lookups

vishesh92 commented Jun 5, 2026

Uh oh!

vishesh92 commented Jun 5, 2026

Uh oh!

blueorangutan commented Jun 5, 2026

Uh oh!

codecovBot commented Jun 5, 2026•
edited
Loading

Uh oh!

vishesh92 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

vishesh92 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 9, 2026

Uh oh!

weizhouapache commented Jun 29, 2026•
edited
Loading

Uh oh!

CopilotAI left a comment

Uh oh!

nvazquez left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Uh oh!

Conversation

vishesh92 commented Jun 5, 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!

vishesh92 commented Jun 5, 2026

Uh oh!

blueorangutan commented Jun 5, 2026

Uh oh!

codecovBot commented Jun 5, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

vishesh92 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

vishesh92 commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 8, 2026

Uh oh!

blueorangutan commented Jun 9, 2026

Uh oh!

weizhouapache commented Jun 29, 2026• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

CopilotAI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

nvazquez left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

codecovBot commented Jun 5, 2026•
edited
Loading

weizhouapache commented Jun 29, 2026•
edited
Loading