Fix a problem when reverting a snapshot from a storage pool already deleted.

The fix here is the same one as introduced in master by apache#2402

Author: rafaelweingartner

engine/schema/src/com/cloud/host/dao/HostDao.java

@@ -19,13 +19,12 @@
 import java.util.Date;
 import java.util.List;
 
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-
 import com.cloud.host.Host;
 import com.cloud.host.Host.Type;
 import com.cloud.host.HostVO;
 import com.cloud.host.Status;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.info.RunningHostCountInfo;
 import com.cloud.resource.ResourceState;
 import com.cloud.utils.db.GenericDao;
@@ -102,5 +101,14 @@ public interface HostDao extends GenericDao<HostVO, Long>, StateDao<Status, Stat
 
     List<HostVO> listByType(Type type);
 
-    HostVO findHostToOperateOnSnapshotBasedOnStoragePool(StoragePoolVO storagePoolVO);
+    /**
+     * This method will look for a host that is of the same hypervisor and zone as indicated in its parameters.
+     * <ul>
+     * <li>We give priority to 'Enabled' hosts, but if no 'Enabled' hosts are found, we use 'Disabled' hosts
+     * <li>If no host is found, we throw a runtime exception
+     * </ul>
+     *
+     * Side note: this method is currently only used in XenServerGuru; therefore, it was designed to meet XenServer deployment scenarios requirements.
+     */
+    HostVO findHostInZoneToExecuteCommand(long zoneId, HypervisorType hypervisorType);
 }

engine/schema/src/com/cloud/host/dao/HostDaoImpl.java

@@ -24,15 +24,14 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.TimeZone;
 
 import javax.annotation.PostConstruct;
 import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.persistence.TableGenerator;
 
-import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 import org.springframework.stereotype.Component;
 
@@ -50,6 +49,7 @@
 import com.cloud.host.Status;
 import com.cloud.host.Status.Event;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.info.RunningHostCountInfo;
 import com.cloud.org.Grouping;
 import com.cloud.org.Managed;
@@ -1127,44 +1127,43 @@ public List<HostVO> listByType(Host.Type type) {
         return listBy(sc);
     }
 
-    String sqlFindHostConnectedToStoragePoolToExecuteCommand = "select h.id from storage_pool pool " + " join cluster c on pool.cluster_id = c.id " + " %s "
-            + " join host h on h.data_center_id = c.data_center_id and h.hypervisor_type = c.hypervisor_type"
-            + " where pool.id = ? and h.status = 'Up' and h.type = 'Routing' and resource_state = '%s' " + " ORDER by rand() limit 1 ";
+
+    String sqlFindHostInZoneToExecuteCommand = "Select id from host "
+            + " where type = 'Routing' and hypervisor_type = ? and data_center_id = ? and status = 'Up' "
+            + " and resource_state = '%s' "
+            + " ORDER by rand() limit 1";
 
     @Override
-    public HostVO findHostToOperateOnSnapshotBasedOnStoragePool(StoragePoolVO storagePoolVO) {
+    public HostVO findHostInZoneToExecuteCommand(long zoneId, HypervisorType hypervisorType) {
         try (TransactionLegacy tx = TransactionLegacy.currentTxn()) {
-            String sql = createSqlFindHostConnectedToStoragePoolToExecuteCommand(storagePoolVO, false);
-            ResultSet rs = executeSqlGetResultSetForMethodFindHostToOperateBasedOnStoragePool(storagePoolVO, tx, sql);
+            String sql = createSqlFindHostToExecuteCommand(false);
+            ResultSet rs = executeSqlGetResultsetForMethodFindHostInZoneToExecuteCommand(hypervisorType, zoneId, tx, sql);
             if (rs.next()) {
                 return findById(rs.getLong("id"));
             }
-            sql = createSqlFindHostConnectedToStoragePoolToExecuteCommand(storagePoolVO, true);
-            rs = executeSqlGetResultSetForMethodFindHostToOperateBasedOnStoragePool(storagePoolVO, tx, sql);
+            sql = createSqlFindHostToExecuteCommand(true);
+            rs = executeSqlGetResultsetForMethodFindHostInZoneToExecuteCommand(hypervisorType, zoneId, tx, sql);
             if (!rs.next()) {
-                throw new CloudRuntimeException(String.format("Could not find a host connected to the storage pool [storagepool=%d]. ", storagePoolVO.getId()));
+                throw new CloudRuntimeException(String.format("Could not find a host in zone [zoneId=%d] to operate on. ", zoneId));
             }
             return findById(rs.getLong("id"));
         } catch (SQLException e) {
             throw new CloudRuntimeException(e);
         }
     }
 
-    private ResultSet executeSqlGetResultSetForMethodFindHostToOperateBasedOnStoragePool(StoragePoolVO storagePoolVO, TransactionLegacy tx, String sql) throws SQLException {
+    private ResultSet executeSqlGetResultsetForMethodFindHostInZoneToExecuteCommand(HypervisorType hypervisorType, long zoneId, TransactionLegacy tx, String sql) throws SQLException {
         PreparedStatement pstmt = tx.prepareAutoCloseStatement(sql);
-        pstmt.setLong(1, storagePoolVO.getId());
+        pstmt.setString(1, Objects.toString(hypervisorType));
+        pstmt.setLong(2, zoneId);
         return pstmt.executeQuery();
     }
 
-    private String createSqlFindHostConnectedToStoragePoolToExecuteCommand(StoragePoolVO storagePoolVO, boolean useDisabledHosts) {
+    private String createSqlFindHostToExecuteCommand(boolean useDisabledHosts) {
         String hostResourceStatus = "Enabled";
         if (useDisabledHosts) {
             hostResourceStatus = "Disabled";
         }
-        String joinForManagedStorage = StringUtils.EMPTY;
-        if (storagePoolVO.isManaged()) {
-            joinForManagedStorage = "join cluster_details cd on cd.cluster_id = c.id and cd.name = 'supportsResign' and cd.value = 'true'";
-        }
-        return String.format(sqlFindHostConnectedToStoragePoolToExecuteCommand, joinForManagedStorage, hostResourceStatus);
+        return String.format(sqlFindHostInZoneToExecuteCommand, hostResourceStatus);
     }
 }

engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDao.java

@@ -121,6 +121,4 @@ public interface PrimaryDataStoreDao extends GenericDao<StoragePoolVO, Long> {
     List<StoragePoolVO> findLocalStoragePoolsByHostAndTags(long hostId, String[] tags);
 
     List<StoragePoolVO> listLocalStoragePoolByPath(long datacenterId, String path);
-
-    StoragePoolVO findStoragePoolForSnapshot(long snapshotId);
 }

engine/schema/src/org/apache/cloudstack/storage/datastore/db/PrimaryDataStoreDaoImpl.java

@@ -525,24 +525,4 @@ public List<StoragePoolVO> findZoneWideStoragePoolsByHypervisor(long dataCenterI
         sc.and(sc.entity().getHypervisor(), Op.EQ, hypervisorType);
         return sc.list();
     }
-
-    private String sqlIsSnapshotStoragePoolManaged = "select pool.id from snapshots s " + " join volumes v on v.id = s.volume_id " + " join storage_pool pool on pool.id = v.pool_id  "
-            + " where s.id = ?";
-
-    @Override
-    public StoragePoolVO findStoragePoolForSnapshot(long snapshotId) {
-        try (TransactionLegacy tx = TransactionLegacy.currentTxn();
-                PreparedStatement pstmt = tx.prepareAutoCloseStatement(sqlIsSnapshotStoragePoolManaged);) {
-            pstmt.setLong(1, snapshotId);
-            ResultSet rs = pstmt.executeQuery();
-            if (!rs.next()) {
-                throw new CloudRuntimeException(String.format("Could not find a storage pool for snapshot [snapshotId=%d]. ", snapshotId));
-            }
-            long storagePoolId = rs.getLong("id");
-            return findById(storagePoolId);
-        } catch (SQLException e) {
-            throw new CloudRuntimeException(e);
-        }
-    }
-
 }

plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java

@@ -191,10 +191,11 @@ public Pair<Boolean, Long> getCommandHostDelegation(long hostId, Command cmd) {
             logger.debug("We are returning the default host to execute commands because the source and destination objects are not snapshot and template respectively.");
             return defaultHostToExecuteCommands;
         }
-        long snapshotId = srcData.getId();
-        StoragePoolVO storagePoolVO = storagePoolDao.findStoragePoolForSnapshot(snapshotId);
-        HostVO hostCandidateToExecutedCommand = hostDao.findHostToOperateOnSnapshotBasedOnStoragePool(storagePoolVO);
+        HostVO defaultHostToExecuteCommand = hostDao.findById(hostId);
+
+        HostVO hostCandidateToExecutedCommand = hostDao.findHostInZoneToExecuteCommand(defaultHostToExecuteCommand.getDataCenterId(), srcData.getHypervisorType());
         hostDao.loadDetails(hostCandidateToExecutedCommand);
+
         String hypervisorVersion = hostCandidateToExecutedCommand.getHypervisorVersion();
         if (StringUtils.isBlank(hypervisorVersion)) {
             logger.debug("We are returning the default host to execute commands because the hypervisor version is blank.");