(cloudstack) branch 4.19 updated: list hosts API fix, when any stale entries exists on storage_pool_host_ref for the removed pools (#9852)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.19 by this push:
     new ee0dc5b2d64 list hosts API fix, when any stale entries exists on 
storage_pool_host_ref for the removed pools (#9852)
ee0dc5b2d64 is described below

commit ee0dc5b2d64516361dbed922fc2f75dec47fd4a0
Author: Suresh Kumar Anaparti <sureshkumar.anapa...@gmail.com>
AuthorDate: Thu Jan 30 20:03:25 2025 +0530

    list hosts API fix, when any stale entries exists on storage_pool_host_ref 
for the removed pools (#9852)
---
 .../main/java/com/cloud/storage/StorageManagerImpl.java  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java 
b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
index 0a45fd448ad..3a6d804a762 100644
--- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java
@@ -503,8 +503,8 @@ public class StorageManagerImpl extends ManagerBase 
implements StorageManager, C
     public boolean isLocalStorageActiveOnHost(Long hostId) {
         List<StoragePoolHostVO> storagePoolHostRefs = 
_storagePoolHostDao.listByHostId(hostId);
         for (StoragePoolHostVO storagePoolHostRef : storagePoolHostRefs) {
-            StoragePoolVO PrimaryDataStoreVO = 
_storagePoolDao.findById(storagePoolHostRef.getPoolId());
-            if (PrimaryDataStoreVO.getPoolType() == StoragePoolType.LVM || 
PrimaryDataStoreVO.getPoolType() == StoragePoolType.EXT) {
+            StoragePoolVO primaryDataStoreVO = 
_storagePoolDao.findById(storagePoolHostRef.getPoolId());
+            if (primaryDataStoreVO != null && 
(primaryDataStoreVO.getPoolType() == StoragePoolType.LVM || 
primaryDataStoreVO.getPoolType() == StoragePoolType.EXT)) {
                 SearchBuilder<VolumeVO> volumeSB = 
volumeDao.createSearchBuilder();
                 volumeSB.and("poolId", volumeSB.entity().getPoolId(), 
SearchCriteria.Op.EQ);
                 volumeSB.and("removed", volumeSB.entity().getRemoved(), 
SearchCriteria.Op.NULL);
@@ -515,7 +515,7 @@ public class StorageManagerImpl extends ManagerBase 
implements StorageManager, C
                 volumeSB.join("activeVmSB", activeVmSB, 
volumeSB.entity().getInstanceId(), activeVmSB.entity().getId(), 
JoinBuilder.JoinType.INNER);
 
                 SearchCriteria<VolumeVO> volumeSC = volumeSB.create();
-                volumeSC.setParameters("poolId", PrimaryDataStoreVO.getId());
+                volumeSC.setParameters("poolId", primaryDataStoreVO.getId());
                 volumeSC.setParameters("state", Volume.State.Expunging, 
Volume.State.Destroy);
                 volumeSC.setJoinParameters("activeVmSB", "state", 
State.Starting, State.Running, State.Stopping, State.Migrating);
 
@@ -2142,9 +2142,9 @@ public class StorageManagerImpl extends ManagerBase 
implements StorageManager, C
         // poolId is null only if volume is destroyed, which has been checked
         // before.
         assert poolId != null;
-        StoragePoolVO PrimaryDataStoreVO = _storagePoolDao.findById(poolId);
-        assert PrimaryDataStoreVO != null;
-        return PrimaryDataStoreVO.getUuid();
+        StoragePoolVO primaryDataStoreVO = _storagePoolDao.findById(poolId);
+        assert primaryDataStoreVO != null;
+        return primaryDataStoreVO.getUuid();
     }
 
     @Override
@@ -2697,8 +2697,8 @@ public class StorageManagerImpl extends ManagerBase 
implements StorageManager, C
         }
 
         CapacityVO capacity = new CapacityVO(poolId, zoneId, podId, clusterId, 
0, 0, Capacity.CAPACITY_TYPE_STORAGE);
-        for (StoragePoolVO PrimaryDataStoreVO : pools) {
-            StorageStats stats = 
ApiDBUtils.getStoragePoolStatistics(PrimaryDataStoreVO.getId());
+        for (StoragePoolVO primaryDataStoreVO : pools) {
+            StorageStats stats = 
ApiDBUtils.getStoragePoolStatistics(primaryDataStoreVO.getId());
             if (stats == null) {
                 continue;
             }