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

- local storage on host in the same zone
- cluser-wide pools in the same 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;
@@ -391,8 +392,8 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
                 answer = copyObject(srcData, objOnImageStore);
 
                 if (answer == null || !answer.getResult()) {
-                    if (answer != null) {
-                        if (logger.isDebugEnabled()) logger.debug("copy to image store failed: " + answer.getDetails());
+                    if (answer != null && logger.isDebugEnabled()) {
+                        logger.debug("copy to image store failed: {}", answer.getDetails());
                     }
                     objOnImageStore.processEvent(Event.OperationFailed);
                     imageStore.delete(objOnImageStore);
@@ -414,8 +415,8 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
                 }
 
                 if (answer == null || !answer.getResult()) {
-                    if (answer != null) {
-                        if (logger.isDebugEnabled()) logger.debug("copy to primary store failed: " + answer.getDetails());
+                    if (answer != null && logger.isDebugEnabled()) {
+                        logger.debug("copy to primary store failed: {}", answer.getDetails());
                     }
                     objOnImageStore.processEvent(Event.OperationFailed);
                     imageStore.delete(objOnImageStore);
@@ -426,7 +427,7 @@ protected Answer copyVolumeBetweenPools(DataObject srcData, DataObject destData)
                     objOnImageStore.processEvent(Event.OperationFailed);
                     imageStore.delete(objOnImageStore);
                 }
-                logger.error("Failed to perform operation: "+ e.getLocalizedMessage());
+                logger.error("Failed to perform operation: {}", e.getLocalizedMessage());
                 throw e;
             }
 
@@ -462,30 +463,63 @@ 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()) &&
                         SUPPORTED_POOL_TYPES_TO_BYPASS_SECONDARY_STORE.contains(((VolumeInfo)destData).getStoragePoolType())) {
 
-                    if (srcDataStoreScope.isSameScope(destDataStoreScope)) {
-                        return true;
-                    }
+                    return canDirectlyCopyBetweenDataStoreScopes(srcDataStoreScope, destDataStoreScope);
+                }
+            }
+        }
 
-                    if (srcDataStoreScope.getScopeType() == ScopeType.CLUSTER &&
-                            destDataStoreScope.getScopeType() == ScopeType.HOST &&
-                            (Objects.equals(((ClusterScope) srcDataStoreScope).getScopeId(), ((HostScope) destDataStoreScope).getClusterId()))) {
-                        return true;
-                    }
+        return false;
+    }
 
-                    if (srcDataStoreScope.getScopeType() == ScopeType.HOST &&
-                            destDataStoreScope.getScopeType() == ScopeType.CLUSTER &&
-                            (Objects.equals(((HostScope) srcDataStoreScope).getClusterId(), ((ClusterScope) destDataStoreScope).getScopeId()))) {
-                        return true;
-                    }
-                }
+    private boolean canDirectlyCopyBetweenDataStoreScopes(Scope srcDataStoreScope, Scope destDataStoreScope) {
+        if (srcDataStoreScope == null || destDataStoreScope == null) {
+            return false;
+        }
+
+        if (srcDataStoreScope.isSameScope(destDataStoreScope)) {
+            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 (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;
+            }
+        }
+
+        if (srcDataStoreScope.getScopeType() == ScopeType.CLUSTER) {
+            if (destDataStoreScope.getScopeType() == ScopeType.ZONE &&
+                    (Objects.equals(((ClusterScope) srcDataStoreScope).getZoneId(), ((ZoneScope) destDataStoreScope).getScopeId()))) {
+                return true;
+            }
+        }
+
+        if (destDataStoreScope.getScopeType() == ScopeType.CLUSTER) {
+            if (srcDataStoreScope.getScopeType() == ScopeType.ZONE &&
+                    (Objects.equals(((ZoneScope) srcDataStoreScope).getScopeId(), ((ClusterScope) destDataStoreScope).getZoneId()))) {
+                return true;
             }
         }