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

Fix #2705: cephfs: mount fails with bad option

Browse Source 
dmesg: libceph: bad option at 'conf=/etc/pve/ceph.conf'

After the upgrade to PVE 6 with Ceph Luminous, the mount.ceph helper
doesn't understand the conf= option yet. And the CephFS mount with the
kernel client fails. After upgrading to Ceph Nautilus the option exists
in the mount.ceph helper.

Signed-off-by: Alwin Antreich <a.antreich@proxmox.com>
This commit is contained in:
Alwin Antreich
2020-04-24 17:29:47 +02:00
committed by Thomas Lamprecht
parent 187e32ce41
commit e54c3e3347
3 changed files with 35 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
PVE/CephConfig.pm
View File

@ -255,4 +255,33 @@ sub ceph_remove_keyfile {
} }
} }
my $ceph_version_parser = sub {
my $ceph_version = shift;
# FIXME this is the same as pve-manager PVE::Ceph::Tools get_local_version
if ($ceph_version =~ /^ceph.*\s(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
my ($version, $buildcommit) = ($1, $2);
my $subversions = [ split(/\.|-/, $version) ];
return ($subversions, $version, $buildcommit);
}
warn "Could not parse Ceph version: '$ceph_version'\n";
};
sub ceph_version {
my ($cache) = @_;
my $version_string = $cache;
if (!defined($version_string)) {
run_command('ceph --version', outfunc => sub {
$version_string = shift;
});
}
return undef if !defined($version_string);
# subversion is an array ref. with the version parts from major to minor
# version is the filtered version string
my ($subversions, $version) = $ceph_version_parser->($version_string);
return wantarray ? ($subversions, $version) : $version;
}
1; 1;

6
PVE/Storage/CephFSPlugin.pm
View File

@ -80,6 +80,7 @@ EOF
sub cephfs_mount { sub cephfs_mount {
my ($scfg, $storeid) = @_; my ($scfg, $storeid) = @_;
my ($subversions) = PVE::CephConfig::ceph_version();
my $mountpoint = $scfg->{path}; my $mountpoint = $scfg->{path};
my $subdir = $scfg->{subdir} // '/'; my $subdir = $scfg->{subdir} // '/';
@ -98,7 +99,10 @@ sub cephfs_mount {
} else { } else {
push @opts, "name=$cmd_option->{userid}"; push @opts, "name=$cmd_option->{userid}";
push @opts, "secretfile=$secretfile" if defined($secretfile); push @opts, "secretfile=$secretfile" if defined($secretfile);
push @opts, "conf=$configfile" if defined($configfile);
# FIXME: remove subversion check in PVE 7.0, not needed for >= Nautilus
# Luminous doesn't know the conf option
push @opts, "conf=$configfile" if defined($configfile) && @$subversions[0] > 12;
} }
push @opts, $scfg->{options} if $scfg->{options}; push @opts, $scfg->{options} if $scfg->{options};

31
PVE/Storage/RBDPlugin.pm
View File

@ -77,7 +77,7 @@ my $librados_connect = sub {
my $krbd_feature_update = sub { my $krbd_feature_update = sub {
my ($scfg, $storeid, $name) = @_; my ($scfg, $storeid, $name) = @_;
my ($versionparts) = ceph_version(); my ($versionparts) = PVE::CephConfig::ceph_version();
return 1 if $versionparts->[0] < 10; return 1 if $versionparts->[0] < 10;
my (@disable, @enable); my (@disable, @enable);
@ -123,35 +123,6 @@ my $krbd_feature_update = sub {
} }
}; };
my $ceph_version_parser = sub {
my $ceph_version = shift;
# FIXME this is the same as pve-manager PVE::Ceph::Tools get_local_version
if ($ceph_version =~ /^ceph.*\s(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
my ($version, $buildcommit) = ($1, $2);
my $subversions = [ split(/\.|-/, $version) ];
return ($subversions, $version, $buildcommit);
}
warn "Could not parse Ceph version: '$ceph_version'\n";
};
sub ceph_version {
my ($cache) = @_;
my $version_string = $cache;
if (!defined($version_string)) {
run_command('ceph --version', outfunc => sub {
$version_string = shift;
});
}
return undef if !defined($version_string);
# subversion is an array ref. with the version parts from major to minor
# version is the filtered version string
my ($subversions, $version) = $ceph_version_parser->($version_string);
return wantarray ? ($subversions, $version) : $version;
}
sub run_rbd_command { sub run_rbd_command {
my ($cmd, %args) = @_; my ($cmd, %args) = @_;