Corrige compressão em multiplos storages secundários

Author: João Jandre

core/src/main/java/org/apache/cloudstack/backup/CompressBackupCommand.java

@@ -28,6 +28,8 @@ public class CompressBackupCommand extends Command {
 
     private List<DeltaMergeTreeTO> backupDeltasToCompress;
 
+    private List<String> backupChainImageStoreUrls;
+
     private long minFreeStorage;
 
     private Backup.CompressionLibrary compressionLib;
@@ -36,7 +38,8 @@ public class CompressBackupCommand extends Command {
 
     private int rateLimit;
 
-    public CompressBackupCommand(List<DeltaMergeTreeTO> backupDeltasToCompress, long minFreeStorage, Backup.CompressionLibrary compressionLib, int coroutines, int rateLimit) {
+    public CompressBackupCommand(List<DeltaMergeTreeTO> backupDeltasToCompress, List<String> backupChainImageStoreUrls, long minFreeStorage, Backup.CompressionLibrary compressionLib, int coroutines, int rateLimit) {
+        this.backupChainImageStoreUrls = backupChainImageStoreUrls;
         this.backupDeltasToCompress = backupDeltasToCompress;
         this.minFreeStorage = minFreeStorage;
         this.compressionLib = compressionLib;
@@ -48,6 +51,10 @@ public List<DeltaMergeTreeTO> getBackupDeltasToCompress() {
         return backupDeltasToCompress;
     }
 
+    public List<String> getBackupChainImageStoreUrls() {
+        return backupChainImageStoreUrls;
+    }
+
     public long getMinFreeStorage() {
         return minFreeStorage;
     }

plugins/backup/knib/src/main/java/org/apache/cloudstack/backup/KnibBackupProvider.java

@@ -751,7 +751,9 @@ public boolean startBackupCompression(long backupId, long hostId) {
 
         BackupOfferingVO backupOfferingVO = backupOfferingDao.findByIdIncludingRemoved(backupVO.getBackupOfferingId());
         NativeBackupOfferingVO nativeBackupOfferingVO = nativeBackupOfferingDao.findByUuid(backupOfferingVO.getExternalId());
-        CompressBackupCommand cmd = new CompressBackupCommand(deltasToCompressAndParents, minFreeStorage, nativeBackupOfferingVO.getCompressionLibrary(),
+        List<NativeBackupJoinVO> backupChain = getBackupJoinParents(backupVO, true);
+        List<String> chainImageStoreUrls = getChainImageStoreUrls(backupChain);
+        CompressBackupCommand cmd = new CompressBackupCommand(deltasToCompressAndParents, chainImageStoreUrls, minFreeStorage, nativeBackupOfferingVO.getCompressionLibrary(),
                 backupCompressionCoroutines.valueIn(hostVO.getClusterId()), backupCompressionRateLimit.valueIn(hostVO.getClusterId()));
         cmd.setWait(backupCompressionTimeout.valueIn(hostVO.getClusterId()));
         Answer answer = agentManager.easySend(hostId, cmd);

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCompressBackupCommandWrapper.java

@@ -38,6 +38,7 @@
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @ResourceWrapper(handles = CompressBackupCommand.class)
 public class LibvirtCompressBackupCommandWrapper extends CommandWrapper<CompressBackupCommand, Answer, LibvirtComputingResource>  {
@@ -57,6 +58,7 @@ public Answer execute(CompressBackupCommand command, LibvirtComputingResource se
 
             KVMStoragePool mainSecStorage = storagePoolManager.getStoragePoolByURI(deltas.stream().findFirst().orElseThrow().getChild().getDataStore().getUrl());
             secondaryStorages.add(mainSecStorage);
+            secondaryStorages.addAll(command.getBackupChainImageStoreUrls().stream().map(storagePoolManager::getStoragePoolByURI).collect(Collectors.toList()));
 
             if (!checkAvailableStorage(command, mainSecStorage, storagePoolManager)) {
                 return new Answer(command, false, "Not enough available space on secondary.");