Use Physical size to evaluate if migration is possible

Author: Pearl1594

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

@@ -33,6 +33,8 @@ public interface DataObject {
 
     Long getSize();
 
+    long getPhysicalSize();
+
     DataObjectType getType();
 
     String getUuid();

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/DataMigrationUtility.java

@@ -114,7 +114,7 @@ protected void checkIfCompleteMigrationPossible(ImageStoreService.MigrationPolic
     }
 
     protected Long getFileSize(DataObject file, Map<DataObject, Pair<List<SnapshotInfo>, Long>> snapshotChain) {
-        Long size = file.getSize();
+        Long size = file.getPhysicalSize();
         Pair<List<SnapshotInfo>, Long> chain = snapshotChain.get(file);
         if (file instanceof SnapshotInfo && chain.first() != null && !chain.first().isEmpty()) {
             size = chain.second();
@@ -159,8 +159,8 @@ protected List<DataObject> sortFilesOnSize(List<DataObject> files, Map<DataObjec
         Collections.sort(files, new Comparator<DataObject>() {
             @Override
             public int compare(DataObject o1, DataObject o2) {
-                Long size1 = o1.getSize();
-                Long size2 = o2.getSize();
+                Long size1 = o1.getPhysicalSize();
+                Long size2 = o2.getPhysicalSize();
                 if (o1 instanceof SnapshotInfo) {
                     size1 = snapshotChains.get(o1).second();
                 }
@@ -226,7 +226,7 @@ protected List<DataObject> getAllReadySnapshotsAndChains(DataStore srcDataStore,
     protected Long getSizeForChain(List<SnapshotInfo> chain) {
         Long size = 0L;
         for (SnapshotInfo snapshot : chain) {
-            size += snapshot.getSize();
+            size += snapshot.getPhysicalSize();
         }
         return size;
     }

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/StorageOrchestrator.java

@@ -194,8 +194,8 @@ public MigrationResponse migrateData(Long srcDataStoreId, List<Long> destDatasto
                 destDatastoreId = orderedDS.get(1);
             }
 
-            if (chosenFileForMigration.getSize() > storageCapacities.get(destDatastoreId).first()) {
-                s_logger.debug("file: " + chosenFileForMigration.getId() + " too large to be migrated to " + destDatastoreId);
+            if (chosenFileForMigration.getPhysicalSize() > storageCapacities.get(destDatastoreId).first()) {
+                s_logger.debug("file: " + chosenFileForMigration.getUuid() + " too large to be migrated to " + destDatastoreId);
                 continue;
             }
 

engine/storage/image/src/main/java/org/apache/cloudstack/storage/image/store/TemplateObject.java

@@ -141,6 +141,15 @@ public Long getSize() {
         return image.getSize();
     }
 
+    @Override
+    public long getPhysicalSize() {
+        TemplateDataStoreVO templateDataStoreVO = templateStoreDao.findByTemplate(imageVO.getId(), DataStoreRole.Image);
+        if (templateDataStoreVO != null) {
+            return templateDataStoreVO.getPhysicalSize();
+        }
+        return imageVO.getSize();
+    }
+
     @Override
     public DataObjectType getType() {
         return DataObjectType.TEMPLATE;

engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeObject.java

@@ -231,6 +231,15 @@ protected DiskOfferingVO getDiskOfferingVO() {
         return diskOfferingId == null ? null : diskOfferingDao.findById(diskOfferingId);
     }
 
+    @Override
+    public long getPhysicalSize() {
+        VolumeDataStoreVO volumeDataStoreVO = volumeStoreDao.findByVolume(volumeVO.getId());
+        if (volumeDataStoreVO != null) {
+            return volumeDataStoreVO.getPhysicalSize();
+        }
+        return volumeVO.getSize();
+    }
+
     @Override
     public Long getBytesReadRate() {
         return getLongValueFromDiskOfferingVoMethod(DiskOfferingVO::getBytesReadRate);

server/src/main/java/org/apache/cloudstack/diagnostics/to/DiagnosticsDataObject.java

@@ -59,6 +59,11 @@ public Long getSize() {
         return null;
     }
 
+    @Override
+    public long getPhysicalSize() {
+        return 0;
+    }
+
     @Override
     public DataObjectType getType() {
         return dataTO.getObjectType();