sureshanaparti commented on code in PR #13877:
URL: https://github.com/apache/cloudstack/pull/13877#discussion_r4033687969
##########
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtTakeBackupCommandWrapper.java:
##########
@@ -80,35 +152,79 @@ public Answer execute(TakeBackupCommand command,
LibvirtComputingResource libvir
"-p", backupPath,
"-q", command.getQuiesce() != null && command.getQuiesce() ?
"true" : "false",
"-d", diskPaths.isEmpty() ? "" : String.join(",", diskPaths)
- });
+ ));
+ if (mode != null && !mode.isEmpty()) {
+ argv.add("-M");
+ argv.add(mode);
+ }
+ if (bitmapNew != null && !bitmapNew.isEmpty()) {
+ argv.add("--bitmap-new");
+ argv.add(bitmapNew);
+ }
+ if (bitmapParent != null && !bitmapParent.isEmpty()) {
+ argv.add("--bitmap-parent");
+ argv.add(bitmapParent);
+ }
+ if (parentPaths != null && !parentPaths.isEmpty()) {
+ argv.add("--parent-paths");
+ argv.add(String.join(",", parentPaths));
+ }
- Pair<Integer, String> result = Script.executePipedCommands(commands,
timeout);
+ List<String[]> commands = new ArrayList<>();
+ commands.add(argv.toArray(new String[0]));
+ return Script.executePipedCommands(commands, timeout);
+ }
- if (result.first() != 0) {
- logger.debug("Failed to take VM backup: " + result.second());
- BackupAnswer answer = new BackupAnswer(command, false,
result.second().trim());
- if (result.first() == EXIT_CLEANUP_FAILED) {
- logger.debug("Backup cleanup failed");
- answer.setNeedsCleanup(true);
+ /**
+ * Return a human-readable validation error string, or {@code null} if the
command's
+ * incremental-backup args are internally consistent.
+ */
+ private String validateBackupArgs(TakeBackupCommand command) {
+ String mode = command.getMode();
+ if (mode == null || mode.isEmpty()) {
Review Comment:
```suggestion
if (StringUtils.isBlank(mode)) {
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
