Merge branch 'fix-npe-volume-creation-from-snap' into '4.20.0.0-scclouds'

Correção em NPE ao criar volume a partir de snapshot de volume

Closes #3180

See merge request scclouds/scclouds!1324

Author: Fabrício Duarte

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java

@@ -25,6 +25,7 @@
 import javax.naming.ConfigurationException;
 
 import com.cloud.storage.VolumeApiServiceImpl;
+import com.cloud.storage.VolumeVO;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.springframework.stereotype.Component;
 
@@ -77,8 +78,13 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
             logDisabledStoragePools(dcId, podId, clusterId, ScopeType.CLUSTER);
         }
 
+        long volumeId = dskCh.getVolumeId();
+        VolumeVO volumeVo = volumeDao.findById(volumeId);
+
+        long accountId = volumeVo.getAccountId();
+
         List<StoragePoolVO> pools = storagePoolDao.findPoolsByTags(dcId, podId, clusterId, dskCh.getTags(), true, VolumeApiServiceImpl.storageTagRuleExecutionTimeout.value());
-        pools.addAll(tagAsRuleHelper.findStoragePoolByScopeAndRuleTags(dcId, podId, clusterId, ScopeType.CLUSTER, List.of(dskCh.getTags()), vmProfile.getVirtualMachine().getAccountId()));
+        pools.addAll(tagAsRuleHelper.findStoragePoolByScopeAndRuleTags(dcId, podId, clusterId, ScopeType.CLUSTER, List.of(dskCh.getTags()), accountId));
         logger.debug(String.format("Found pools [%s] that match with tags [%s].", pools, Arrays.toString(dskCh.getTags())));
 
         // add remaining pools in cluster, that did not match tags, to avoid set

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java

@@ -24,6 +24,7 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
+import com.cloud.storage.VolumeVO;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.springframework.stereotype.Component;
@@ -98,9 +99,15 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
                 logger.debug("LocalStoragePoolAllocator is returning null since both the host ID and pod ID are null. That means this should be a zone wide primary storage deployment.");
                 return null;
             }
+
+            long volumeId = dskCh.getVolumeId();
+            VolumeVO volumeVo = volumeDao.findById(volumeId);
+
+            long accountId = volumeVo.getAccountId();
+
             List<StoragePoolVO> availablePools =
                 storagePoolDao.findLocalStoragePoolsByTags(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId(), dskCh.getTags(), true, keyword);
-            availablePools.addAll(tagAsRuleHelper.findStoragePoolByScopeAndRuleTags(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId(), ScopeType.HOST, List.of(dskCh.getTags()), vmProfile.getVirtualMachine().getAccountId()));
+            availablePools.addAll(tagAsRuleHelper.findStoragePoolByScopeAndRuleTags(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId(), ScopeType.HOST, List.of(dskCh.getTags()), accountId));
             for (StoragePoolVO pool : availablePools) {
                 if (suitablePools.size() == returnUpTo) {
                     break;

engine/storage/src/main/java/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java

@@ -24,6 +24,7 @@
 
 import javax.inject.Inject;
 
+import com.cloud.storage.VolumeVO;
 import org.springframework.stereotype.Component;
 
 import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager;
@@ -60,9 +61,14 @@ protected List<StoragePool> select(DiskProfile dskCh, VirtualMachineProfile vmPr
             logDisabledStoragePools(plan.getDataCenterId(), null, null, ScopeType.ZONE);
         }
 
+        long volumeId = dskCh.getVolumeId();
+        VolumeVO volumeVo = volumeDao.findById(volumeId);
+
+        long accountId = volumeVo.getAccountId();
+
         List<StoragePool> suitablePools = new ArrayList<>();
         List<StoragePoolVO> storagePools = storagePoolDao.findZoneWideStoragePoolsByTags(plan.getDataCenterId(), dskCh.getTags(), true);
-        storagePools.addAll(tagAsRuleHelper.findStoragePoolByScopeAndRuleTags(plan.getDataCenterId(), null, null, ScopeType.ZONE, List.of(dskCh.getTags()), vmProfile.getVirtualMachine().getAccountId()));
+        storagePools.addAll(tagAsRuleHelper.findStoragePoolByScopeAndRuleTags(plan.getDataCenterId(), null, null, ScopeType.ZONE, List.of(dskCh.getTags()), accountId));
         if (storagePools.isEmpty()) {
             logger.debug(String.format("Could not find any zone wide storage pool that matched with any of the following tags [%s].", Arrays.toString(dskCh.getTags())));
             storagePools = new ArrayList<>();