yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cephfs: Exclude _netdev when mounting with fuse

Browse Source 
Since ceph-fuse is called directly in the CephFS storage plugin, which
can not process the _netdev option, mounting the CephFS storage fails
when fuse is set in the storage.cfg.

This patch moves the _netdev option into the else part of the if fuse is
set statement. _netdev is only added if the CephFS kernel client mounts
the storage.

It seems _netdev is not needed anyway for the fuse mount, as the
connection is closed, once the fuse process gets killed on shutdown.

Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
This commit is contained in:
Alwin Antreich
2019-06-12 12:32:05 +02:00
committed by Thomas Lamprecht
parent 243f413ad2
commit 9553b55c4f
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
PVE/Storage/CephFSPlugin.pm
View File

@ -65,11 +65,12 @@ sub cephfs_mount {
my $source = "$server:$subdir";
$cmd = ['/bin/mount', '-t', 'ceph', $source, $mountpoint, '-o', "name=$cmd_option->{userid}"];
push @$cmd, '-o', "secretfile=$secretfile" if defined($secretfile);
# tell systemd that we're network dependent, else it umounts us to late
# on shutdown, when we couldn't connect to the active MDS and thus
# unmount hangs and delays shutdown/reboot (man systemd.mount).
push @$cmd, '-o', '_netdev';
}
# tell systemd that we're network dependent, else it umounts us to late on
# shutdown, when we couldn't connect to the active MDS and thus unmount
# hangs and delays shutdown/reboot (man systemd.mount)
push @$cmd, '-o', '_netdev';
if ($scfg->{options}) {
push @$cmd, '-o', $scfg->{options};