Bypass secondary storage for copy volume between zone-wide pools and host in the zone

Author: sureshanaparti

engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/HostScope.java

@@ -22,6 +22,7 @@
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 public class HostScope extends AbstractScope {
+    private ScopeType type = ScopeType.HOST;
     private Long hostId;
     private Long clusterId;
     private Long zoneId;
@@ -35,7 +36,7 @@ public HostScope(Long hostId, Long clusterId, Long zoneId) {
 
     @Override
     public ScopeType getScopeType() {
-        return ScopeType.HOST;
+        return this.type;
     }
 
     @Override

engine/storage/datamotion/src/main/java/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java

@@ -363,6 +363,7 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
 
         if (cacheStore == null) {
             if (bypassSecondaryStorage) {
+                logger.debug("Secondary storage is bypassed, copy volume between pools directly");
                 CopyCommand cmd = new CopyCommand(srcData.getTO(), destData.getTO(), _copyvolumewait, VirtualMachineManager.ExecuteInSequence.value());
                 EndPoint ep = selector.select(srcData, destData, encryptionRequired);
                 Answer answer = null;
@@ -462,9 +463,8 @@ private boolean canBypassSecondaryStorage(DataObject srcData, DataObject destDat
             if (destData instanceof VolumeInfo) {
                 Scope srcDataStoreScope = srcData.getDataStore().getScope();
                 Scope destDataStoreScope = destData.getDataStore().getScope();
-                logger.info("srcDataStoreScope: {}, destDataStoreScope: {}", srcDataStoreScope, destDataStoreScope);
-                logger.info("srcData - pool type: {}, scope: {}; destData - pool type: {}, scope: {}",
-                        ((VolumeInfo)srcData).getStoragePoolType(), srcDataStoreScope != null ? srcDataStoreScope.getScopeType() : null, ((VolumeInfo)destData).getStoragePoolType(), destDataStoreScope != null ? destDataStoreScope.getScopeType() : null);
+                logger.info("srcDataStoreScope: {}, srcData pool type: {}; destDataStoreScope: {}, destData pool type: {}",
+                        srcDataStoreScope, ((VolumeInfo)srcData).getStoragePoolType(), destDataStoreScope, ((VolumeInfo)destData).getStoragePoolType());
 
                 if (srcDataStoreScope != null && destDataStoreScope != null &&
                         SUPPORTED_POOL_TYPES_TO_BYPASS_SECONDARY_STORE.contains(((VolumeInfo)srcData).getStoragePoolType()) &&
@@ -474,16 +474,26 @@ private boolean canBypassSecondaryStorage(DataObject srcData, DataObject destDat
                         return true;
                     }
 
-                    if (srcDataStoreScope.getScopeType() == ScopeType.CLUSTER &&
-                            destDataStoreScope.getScopeType() == ScopeType.HOST &&
-                            (Objects.equals(((ClusterScope) srcDataStoreScope).getScopeId(), ((HostScope) destDataStoreScope).getClusterId()))) {
-                        return true;
+                    if (srcDataStoreScope.getScopeType() == ScopeType.HOST) {
+                        if (destDataStoreScope.getScopeType() == ScopeType.CLUSTER &&
+                                (Objects.equals(((HostScope) srcDataStoreScope).getClusterId(), ((ClusterScope) destDataStoreScope).getScopeId()))) {
+                            return true;
+                        }
+                        if (destDataStoreScope.getScopeType() == ScopeType.ZONE &&
+                                (Objects.equals(((HostScope) srcDataStoreScope).getZoneId(), ((ZoneScope) destDataStoreScope).getScopeId()))) {
+                            return true;
+                        }
                     }
 
-                    if (srcDataStoreScope.getScopeType() == ScopeType.HOST &&
-                            destDataStoreScope.getScopeType() == ScopeType.CLUSTER &&
-                            (Objects.equals(((HostScope) srcDataStoreScope).getClusterId(), ((ClusterScope) destDataStoreScope).getScopeId()))) {
-                        return true;
+                    if (destDataStoreScope.getScopeType() == ScopeType.HOST) {
+                        if (srcDataStoreScope.getScopeType() == ScopeType.CLUSTER &&
+                                (Objects.equals(((ClusterScope) srcDataStoreScope).getScopeId(), ((HostScope) destDataStoreScope).getClusterId()))) {
+                            return true;
+                        }
+                        if (srcDataStoreScope.getScopeType() == ScopeType.ZONE &&
+                                (Objects.equals(((ZoneScope) srcDataStoreScope).getScopeId(), ((HostScope) destDataStoreScope).getZoneId()))) {
+                            return true;
+                        }
                     }
                 }
             }