Skip to content

Use correct ID to get value of backup.validation.script.default.timeout #13652

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
winterhazel merged 2 commits into from
Jul 20, 2026
+4 −4
Merged

Use correct ID to get value of backup.validation.script.default.timeout #13652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a90c002
address review on original PR
JoaoJandre Jul 20, 2026
765e561
address other small reviews
JoaoJandre Jul 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
4 changes: 2 additions & 2 deletions plugins/backup/kboss/src/main/java/org/apache/cloudstack/backup/KbossBackupProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2740,7 +2740,7 @@ protected void configureValidationScript(ValidateKbossVmCommand cmd, BackupVO ba
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) {
Expand Down Expand Up @@ -2881,7 +2881,7 @@ protected boolean validateBackupStateForRemoval(long backupId) {
}

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;
Expand Down
Loading