From 6feaab581931d29f6b1b8e436204ac3c2968c6e8 Mon Sep 17 00:00:00 2001 From: "tao.gan" Date: Thu, 13 Aug 2026 09:56:09 +0800 Subject: [PATCH 1/2] [localstorage]: pass local storage uuid for sftp downloads Resolves: ZSV-12865 Change-Id: I6b696b62746e797a727969686675696365676373 --- .../local/LocalStorageKvmSftpBackupStorageMediatorImpl.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java index 8bc6cc090b7..dae2ef16ef0 100755 --- a/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java +++ b/plugin/localstorage/src/main/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java @@ -183,6 +183,8 @@ public void run(MessageReply reply) { cmd.setSshPort(greply.getSshPort()); cmd.setBackupStorageInstallPath(backupStorageInstallPath); cmd.setPrimaryStorageInstallPath(primaryStorageInstallPath); + cmd.uuid = pinv.getUuid(); + cmd.primaryStorageUuid = pinv.getUuid(); cmd.storagePath = pinv.getUrl(); KVMHostAsyncHttpCallMsg msg = new KVMHostAsyncHttpCallMsg(); From 8f4a2a3ee91f7fa608ba3cdc3c23a1556b03b1d4 Mon Sep 17 00:00:00 2001 From: "tao.gan" Date: Thu, 13 Aug 2026 09:56:28 +0800 Subject: [PATCH 2/2] [compute]: make block device fstab entries non-blocking Resolves: ZSV-12865 Change-Id: I7372756b667a6c626368676f7579736c77777665 --- .../org/zstack/compute/host/MountBlockDeviceHelper.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java b/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java index fd69427bb13..62188f43697 100644 --- a/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java +++ b/compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java @@ -22,8 +22,8 @@ final class MountBlockDeviceHelper { static final String LOG_PREFIX = "[MountBlockDevice]"; private static final String FSTAB_SCAN_NO_UUID_SENTINEL = "__zs_no_uuid__"; - private static final String FSTAB_OPTIONS_MULTIPATH = "defaults,_netdev,x-systemd.device-timeout=10"; - private static final String FSTAB_OPTIONS_DEFAULT = "defaults"; + private static final String FSTAB_OPTIONS_MULTIPATH = "defaults,_netdev,nofail,x-systemd.device-timeout=10"; + private static final String FSTAB_OPTIONS_DEFAULT = "defaults,nofail,x-systemd.device-timeout=10"; private static final String MULTIPATH_PREFIX = "/dev/mapper/mpath"; private MountBlockDeviceHelper() { @@ -352,4 +352,4 @@ private static SshResult executeSshCommand(Ssh ssh, String command) { } return ret; } -} \ No newline at end of file +}