This is an automated email from the ASF dual-hosted git repository.
winterhazel pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/main by this push:
new fc832413d2c Use correct ID to get value of
backup.validation.script.default.timeout (#13652)
fc832413d2c is described below
commit fc832413d2c0f4012f2c512acc56866d156a17c4
Author: João Jandre <[email protected]>
AuthorDate: Mon Jul 20 13:35:58 2026 -0300
Use correct ID to get value of backup.validation.script.default.timeout
(#13652)
---
.../apache/cloudstack/api/command/user/backup/CreateBackupCmd.java | 2 +-
.../cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java | 2 +-
.../main/java/org/apache/cloudstack/backup/KbossBackupProvider.java | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
index 9ce64c2294b..5b7bd518df0 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupCmd.java
@@ -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")
diff --git
a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
index 41c530471da..812d78425e8 100644
---
a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
+++
b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/CreateBackupScheduleCmd.java
@@ -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")
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 27f4d9b343e..60bfb7a0b58 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
@@ -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;
