Extract duplicate code into new method checkAndRemoveBackupOfferingBeforeExpunge()

Author: abh1sar

api/src/main/java/org/apache/cloudstack/backup/BackupManager.java

@@ -257,4 +257,6 @@ public interface BackupManager extends BackupService, Configurable, PluggableSer
     void updateOrphanedBackups(VirtualMachine vm);
 
     Capacity getBackupStorageUsedStats(Long zoneId);
+
+    void checkAndRemoveBackupOfferingBeforeExpunge(VirtualMachine vm);
 }

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -57,7 +57,6 @@
 import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd;
 import org.apache.cloudstack.api.command.admin.volume.MigrateVolumeCmdByAdmin;
 import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd;
-import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.backup.dao.BackupDao;
 import org.apache.cloudstack.ca.CAManager;
@@ -2349,17 +2348,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) throws
                         throw new CloudRuntimeException("Unable to destroy " + vm);
                     } else {
                         if (expunge) {
-                            if (vm.getBackupOfferingId() != null) {
-                                List<Backup> backupsForVm = backupDao.listByVmId(vm.getDataCenterId(), vm.getId());
-                                if (CollectionUtils.isEmpty(backupsForVm)) {
-                                    backupManager.removeVMFromBackupOffering(vm.getId(), true);
-                                } else {
-                                    throw new CloudRuntimeException(String.format("This VM [uuid: %s, name: %s] has a "
-                                                    + "Backup Offering [id: %s, external id: %s] with %s backups. Please, remove the backup offering "
-                                                    + "before proceeding to VM exclusion!", vm.getUuid(), vm.getInstanceName(), vm.getBackupOfferingId(),
-                                            vm.getBackupExternalId(), backupsForVm.size()));
-                                }
-                            }
+                            backupManager.checkAndRemoveBackupOfferingBeforeExpunge(vm);
                             if (!stateTransitTo(vm, VirtualMachine.Event.ExpungeOperation, vm.getHostId())) {
                                 logger.debug("Unable to expunge the vm because it is not in the correct state: {}", vm);
                                 throw new CloudRuntimeException("Unable to expunge " + vm);

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -95,7 +95,6 @@
 import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
 import org.apache.cloudstack.api.command.user.volume.ChangeOfferingForVolumeCmd;
 import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd;
-import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.backup.BackupVO;
 import org.apache.cloudstack.backup.dao.BackupDao;
@@ -2483,17 +2482,7 @@ public boolean expunge(UserVmVO vm) {
         }
         try {
 
-            if (vm.getBackupOfferingId() != null) {
-                List<Backup> backupsForVm = backupDao.listByVmId(vm.getDataCenterId(), vm.getId());
-                if (CollectionUtils.isEmpty(backupsForVm)) {
-                    backupManager.removeVMFromBackupOffering(vm.getId(), true);
-                } else {
-                    throw new CloudRuntimeException(String.format("This VM [uuid: %s, name: %s] has a "
-                            + "Backup Offering [id: %s, external id: %s] with %s backups. Please, remove the backup offering "
-                            + "before proceeding to VM exclusion!", vm.getUuid(), vm.getInstanceName(), vm.getBackupOfferingId(),
-                            vm.getBackupExternalId(), backupsForVm.size()));
-                }
-            }
+            backupManager.checkAndRemoveBackupOfferingBeforeExpunge(vm);
 
             autoScaleManager.removeVmFromVmGroup(vm.getId());
 

server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java

@@ -1817,4 +1817,20 @@ public CapacityVO getBackupStorageUsedStats(Long zoneId) {
         Pair<Long, Long> backupUsage = backupProvider.getBackupStorageStats(zoneId);
         return new CapacityVO(null, zoneId, null, null, backupUsage.first(), backupUsage.second(), Capacity.CAPACITY_TYPE_BACKUP_STORAGE);
     }
+
+    @Override
+    public void checkAndRemoveBackupOfferingBeforeExpunge(VirtualMachine vm) {
+        if (vm.getBackupOfferingId() == null) {
+            return;
+        }
+        List<Backup> backupsForVm = backupDao.listByVmId(vm.getDataCenterId(), vm.getId());
+        if (org.apache.commons.collections.CollectionUtils.isEmpty(backupsForVm)) {
+            removeVMFromBackupOffering(vm.getId(), true);
+        } else {
+            throw new CloudRuntimeException(String.format("This VM [uuid: %s, name: %s] has a "
+                            + "Backup Offering [id: %s, external id: %s] with %s backups. Please, remove the backup offering "
+                            + "before proceeding to VM exclusion!", vm.getUuid(), vm.getInstanceName(), vm.getBackupOfferingId(),
+                    vm.getBackupExternalId(), backupsForVm.size()));
+        }
+    }
 }