Don't remove MDM IPs when other pools of same ScaleIO/PowerFlex cluster are connected

Author: sureshanaparti

engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolHostDao.java

@@ -30,6 +30,8 @@ public interface StoragePoolHostDao extends GenericDao<StoragePoolHostVO, Long>
 
     public StoragePoolHostVO findByPoolHost(long poolId, long hostId);
 
+    List<StoragePoolHostVO> findByLocalPath(String path);
+
     List<StoragePoolHostVO> listByHostStatus(long poolId, Status hostStatus);
 
     List<Long> findHostsConnectedToPools(List<Long> poolIds);

engine/schema/src/main/java/com/cloud/storage/dao/StoragePoolHostDaoImpl.java

@@ -45,6 +45,7 @@ public class StoragePoolHostDaoImpl extends GenericDaoBase<StoragePoolHostVO, Lo
     protected final SearchBuilder<StoragePoolHostVO> PoolSearch;
     protected final SearchBuilder<StoragePoolHostVO> HostSearch;
     protected final SearchBuilder<StoragePoolHostVO> PoolHostSearch;
+    protected final SearchBuilder<StoragePoolHostVO> LocalPathSearch;
 
     protected SearchBuilder<StoragePoolHostVO> poolNotInClusterSearch;
 
@@ -77,6 +78,9 @@ public StoragePoolHostDaoImpl() {
         PoolHostSearch.and("host_id", PoolHostSearch.entity().getHostId(), SearchCriteria.Op.EQ);
         PoolHostSearch.done();
 
+        LocalPathSearch = createSearchBuilder();
+        LocalPathSearch.and("local_path", LocalPathSearch.entity().getLocalPath(), SearchCriteria.Op.EQ);
+        LocalPathSearch.done();
     }
 
     @PostConstruct
@@ -117,6 +121,13 @@ public StoragePoolHostVO findByPoolHost(long poolId, long hostId) {
         return findOneIncludingRemovedBy(sc);
     }
 
+    @Override
+    public List<StoragePoolHostVO> findByLocalPath(String path) {
+        SearchCriteria<StoragePoolHostVO> sc = LocalPathSearch.create();
+        sc.setParameters("local_path", path);
+        return listBy(sc);
+    }
+
     @Override
     public List<StoragePoolHostVO> listByHostStatus(long poolId, Status hostStatus) {
         TransactionLegacy txn = TransactionLegacy.currentTxn();

plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/manager/ScaleIOSDCManagerImpl.java

@@ -297,7 +297,8 @@ public boolean unprepareSDC(Host host, DataStore dataStore) {
             }
 
             if (!canUnprepareSDC(host, dataStore)) {
-                logger.debug("Cannot unprepare SDC, there might be some volumes mapped to the SDC that belongs to the storage pools of PowerFlex storage cluster");
+                logger.debug("Cannot unprepare SDC, there might be other connected pools of same PowerFlex storage cluster," +
+                        "or some volumes mapped to the SDC that belongs to any of the storage pools of the PowerFlex storage cluster");
                 return false;
             }
 
@@ -358,6 +359,12 @@ public boolean canUnprepareSDC(Host host, DataStore dataStore) {
             return false;
         }
 
+        List<StoragePoolHostVO> poolHostVOsBySdc = storagePoolHostDao.findByLocalPath(sdcId);
+        if (CollectionUtils.isNotEmpty(poolHostVOsBySdc) && poolHostVOsBySdc.size() > 1) {
+            LOGGER.debug(String.format("There are other connected pools with the same SDC of the host %s, shouldn't unprepare SDC", host));
+            return false;
+        }
+
         try {
             final ScaleIOGatewayClient client = getScaleIOClient(dataStore.getId());
             return client.listVolumesMappedToSdc(sdcId).isEmpty();