diff --git a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java index c2b091700edc..b4cad92d8770 100644 --- a/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java +++ b/engine/schema/src/main/java/org/apache/cloudstack/backup/BackupVO.java @@ -128,11 +128,10 @@ public class BackupVO implements Backup { public BackupVO() { this.uuid = UUID.randomUUID().toString(); - this.compressionStatus = CompressionStatus.Uncompressed; - this.validationStatus = ValidationStatus.NotValidated; } - public BackupVO(String name, long vmId, long backupOfferingId, long accountId, long domainId, long zoneId, long virtualSize, Status status, Long backupScheduleId) { + public BackupVO(String name, long vmId, long backupOfferingId, long accountId, long domainId, long zoneId, long virtualSize, + Status status, Long backupScheduleId, CompressionStatus compressionStatus, ValidationStatus validationStatus) { this.name = name; this.vmId = vmId; this.backupOfferingId = backupOfferingId; @@ -144,8 +143,8 @@ public BackupVO(String name, long vmId, long backupOfferingId, long accountId, l this.setType("FULL"); this.uuid = UUID.randomUUID().toString(); this.backupScheduleId = backupScheduleId; - this.compressionStatus = CompressionStatus.Uncompressed; - this.validationStatus = ValidationStatus.NotValidated; + this.compressionStatus = compressionStatus; + this.validationStatus = validationStatus; } @Override diff --git a/plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java b/plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java index 60bfb7a0b584..0569c318935e 100644 --- a/plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java +++ b/plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java @@ -1071,7 +1071,8 @@ protected Outcome createBackupThroughJobQueue(VirtualMachine vm, boolean quie long vmId = vm.getId(); BackupVO backup = new BackupVO(String.format("%s-%s", vm.getHostName(), DateUtil.getDateInSystemTimeZone()), vmId, vm.getBackupOfferingId(), accountId, - vm.getDomainId(), vm.getDataCenterId(), 0, Backup.Status.Queued, backupScheduleId); + vm.getDomainId(), vm.getDataCenterId(), 0, Backup.Status.Queued, backupScheduleId, + Backup.CompressionStatus.Uncompressed, Backup.ValidationStatus.NotValidated); VmWorkJobVO workJob = new VmWorkJobVO(AsyncJobExecutionContext.getOriginJobId(), userId, accountId, VmWorkTakeBackup.class.getName(), vmId, VirtualMachine.Type.Instance, VmWorkJobVO.Step.Starting); diff --git a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java index 9be4c7ea083c..58bad20e4f1a 100644 --- a/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java +++ b/server/src/main/java/org/apache/cloudstack/backup/BackupManagerImpl.java @@ -2653,11 +2653,15 @@ public BackupResponse createBackupResponse(Backup backup, Boolean listVmDetails) response.setProtectedSize(backup.getProtectedSize()); response.setStatus(backup.getStatus()); response.setIntervalType("MANUAL"); - response.setCompressionStatus(backup.getCompressionStatus()); - if (backup.getUncompressedSize() != null && backup.getUncompressedSize() > 0) { - response.setUncompressedSize(backup.getUncompressedSize()); + if (backup.getCompressionStatus() != null) { + response.setCompressionStatus(backup.getCompressionStatus()); + if (backup.getUncompressedSize() != null && backup.getUncompressedSize() > 0) { + response.setUncompressedSize(backup.getUncompressedSize()); + } + } + if (backup.getValidationStatus() != null) { + response.setValidationStatus(backup.getValidationStatus()); } - response.setValidationStatus(backup.getValidationStatus()); if (backup.getBackupScheduleId() != null) { BackupScheduleVO scheduleVO = backupScheduleDao.findById(backup.getBackupScheduleId()); if (scheduleVO != null) { diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue index f6fd6be3583a..9272617900f1 100644 --- a/ui/src/components/view/ListView.vue +++ b/ui/src/components/view/ListView.vue @@ -484,10 +484,10 @@ />