Skip to content

<fix>[localstorage]: guard local storage writes by initialized file #4664

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

Closed
MatheMatrix wants to merge 2 commits into from
+5 −3
Closed

<fix>[localstorage]: guard local storage writes by initialized file #4664

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
6feaab5
<fix>[localstorage]: pass local storage uuid for sftp downloads
taogan21 Aug 13, 2026
8f4a2a3
<fix>[compute]: make block device fstab entries non-blocking
taogan21 Aug 13, 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
6 changes: 3 additions & 3 deletions compute/src/main/java/org/zstack/compute/host/MountBlockDeviceHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -352,4 +352,4 @@ private static SshResult executeSshCommand(Ssh ssh, String command) {
}
return ret;
}
}
}
2 changes: 2 additions & 0 deletions ...n/java/org/zstack/storage/primary/local/LocalStorageKvmSftpBackupStorageMediatorImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down