gian/cloudstack-mirror
1
0
Fork 0
mirror of https://github.com/apache/cloudstack synced 2026-08-01 21:25:23 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Use correct ID to get value of backup.validation.script.default.timeout (#13652)
Some checks are pending
CodeQL Analysis / CodeQL (actions) (push) Waiting to run
Details
Docker Image Build / build (push) Waiting to run
Details
Sonar Quality Check (Main) / Sonar JaCoCo Coverage (push) Waiting to run
Details

Browse Source
This commit is contained in:
João Jandre 2026-07-20 13:35:58 -03:00 committed by GitHub
parent 7900b2715a
commit fc832413d2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
View File

@ -75,7 +75,7 @@ public class CreateBackupCmd extends BaseAsyncCreateCmd {
@Parameter(name = ApiConstants.QUIESCE_VM,
type = CommandType.BOOLEAN,
required = false,
description = "Quiesce the instance before checkpointing the disks for backup. Applicable only to NAS backup provider. " +
description = "Quiesce the instance before checkpointing the disks for backup. Applicable only to NAS and KBOSS backup providers. " +
"The filesystem is frozen before the backup starts and thawed immediately after. " +
"Requires the instance to have the QEMU Guest Agent installed and running.",
since = "4.21.0")

2
api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
View File

@ -82,7 +82,7 @@ public class CreateBackupScheduleCmd extends BaseCmd {
@Parameter(name = ApiConstants.QUIESCE_VM,
type = CommandType.BOOLEAN,
required = false,
description = "Quiesce the Instance before checkpointing the disks for backup. Applicable only to NAS backup provider. " +
description = "Quiesce the Instance before checkpointing the disks for backup. Applicable only to NAS and KBOSS backup providers. " +
"The filesystem is frozen before the backup starts and thawed immediately after. " +
"Requires the instance to have the QEMU Guest Agent installed and running.",
since = "4.21.0")

4
plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java
View File

@ -2740,7 +2740,7 @@ public class KbossBackupProvider extends AdapterBase implements InternalBackupPr
cmd.setExpectedResult(scriptExpectedResult != null ? scriptExpectedResult.getValue() : "0");
VMInstanceDetailVO scriptTimeout = vmInstanceDetailsDao.findDetail(vmId, VmDetailConstants.VALIDATION_COMMAND_TIMEOUT);
cmd.setScriptTimeout(scriptTimeout != null ? Integer.valueOf(scriptTimeout.getValue()) :
BackupValidationServiceJobController.backupValidationScriptDefaultTimeout.valueIn(backupVO.getId()));
BackupValidationServiceJobController.backupValidationScriptDefaultTimeout.valueIn(backupVO.getAccountId()));
}
protected void createBasicBackupDetails(Long imageStoreId, Long parentId, BackupVO backupVO) {
@ -2881,7 +2881,7 @@ public class KbossBackupProvider extends AdapterBase implements InternalBackupPr
}
if (Backup.ValidationStatus.Validating.equals(backupVO.getValidationStatus())) {
logger.error("Backup [{}] is being validated, we cannot delete it. Please wait for the validation process to end and try again later.");
logger.error("Backup [{}] is being validated, we cannot delete it. Please wait for the validation process to end and try again later.", backupVO.getUuid());
return false;
}
return true;