From d50899427a70185bd0933bf386ae52aa0eab396b Mon Sep 17 00:00:00 2001
From: Daan Hoogland <dahn@apache.org>
Date: Mon, 26 Jan 2026 14:17:38 +0100
Subject: [PATCH] merge forward error

---
 .../src/main/java/com/cloud/resource/ResourceManagerImpl.java   | 2 +-
 .../test/java/com/cloud/resource/ResourceManagerImplTest.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
index ab3162e7a4b..110353c4b48 100755
--- a/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
@@ -2366,7 +2366,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
             List<Long> conflictingHostIds = new ArrayList<>(CollectionUtils.intersection(hostIdsToDisconnect, hostIdsUsingTheStoragePool));
             if (CollectionUtils.isNotEmpty(conflictingHostIds)) {
                 Map<HostVO, List<VolumeVO>> hostVolumeMap = new HashMap<>();
-                List<VolumeVO> volumesInPool = volumeDao.findByPoolId(poolId);
+                List<VolumeVO> volumesInPool = volumeDao.findNonDestroyedVolumesByPoolId(poolId);
                 Map<Long, VMInstanceVO> vmInstanceCache = new HashMap<>();
 
                 for (Long hostId : conflictingHostIds) {
diff --git a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
index 6ed0774a423..7e60c111ab2 100644
--- a/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
+++ b/server/src/test/java/com/cloud/resource/ResourceManagerImplTest.java
@@ -944,7 +944,7 @@ public class ResourceManagerImplTest {
         Mockito.when(volume2.getInstanceId()).thenReturn(101L);
 
         List<VolumeVO> volumesInPool = Arrays.asList(volume1, volume2);
-        Mockito.doReturn(volumesInPool).when(volumeDao).findByPoolId(poolId);
+        Mockito.doReturn(volumesInPool).when(volumeDao).findNonDestroyedVolumesByPoolId(poolId);
 
         VMInstanceVO vmInstance1 = Mockito.mock(VMInstanceVO.class);
         VMInstanceVO vmInstance2 = Mockito.mock(VMInstanceVO.class);