diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java index 22dbfbdd67a..2b2e09df690 100644 --- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java +++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRestoreBackupCommandWrapper.java @@ -45,6 +45,7 @@ import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Objects; @@ -52,7 +53,6 @@ import java.util.Objects; @ResourceWrapper(handles = RestoreBackupCommand.class) public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper { private static final String BACKUP_TEMP_FILE_PREFIX = "csbackup"; - private static final String MOUNT_COMMAND = "sudo mount -t %s %s %s"; private static final String UMOUNT_COMMAND = "sudo umount %s"; private static final String FILE_PATH_PLACEHOLDER = "%s/%s"; private static final String ATTACH_QCOW2_DISK_COMMAND = " virsh attach-disk %s %s %s --driver qemu --subdriver qcow2 --cache none"; @@ -197,7 +197,7 @@ public class LibvirtRestoreBackupCommandWrapper extends CommandWrapper commands = new ArrayList<>(); + List cmd = new ArrayList<>(); + cmd.add("sudo"); + cmd.add("mount"); + cmd.add("-t"); + cmd.add(backupRepoType); + cmd.add(backupRepoAddress); + cmd.add(mountDirectory); + if (Objects.nonNull(mountOptions) && !mountOptions.trim().isEmpty()) { + cmd.add("-o"); + cmd.add(mountOptions); + } + commands.add(cmd.toArray(new String[0])); + + Pair result = Script.executePipedCommands(commands, mountTimeout); + if (result.first() != 0) { + logger.error("Failed to mount repository {} of type {} to the directory {}. Error: {}", + backupRepoAddress, backupRepoType, mountDirectory, result.second()); throw new CloudRuntimeException("Failed to mount the backup repository on the KVM host"); } + return mountDirectory; }