From: Patrick Donnelly Date: Tue, 3 Mar 2020 00:58:02 +0000 (-0800) Subject: Merge PR #33506 into master X-Git-Tag: v15.1.1~162 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61681cffd2ae69a2908f98366ad8edee09f6ba30;p=ceph.git Merge PR #33506 into master * refs/pull/33506/head: client: add client_fs mount option support Reviewed-by: Ramana Raja Reviewed-by: Patrick Donnelly --- 61681cffd2ae69a2908f98366ad8edee09f6ba30 diff --cc qa/tasks/cephfs/fuse_mount.py index 27d89437df7a,29fa4319d65e..0faf3a902150 --- a/qa/tasks/cephfs/fuse_mount.py +++ b/qa/tasks/cephfs/fuse_mount.py @@@ -68,10 -68,8 +68,10 @@@ class FuseMount(CephFSMount) fuse_cmd += ["--client_mountpoint={0}".format(mount_path)] if mount_fs_name is not None: - fuse_cmd += ["--client_mds_namespace={0}".format(mount_fs_name)] + fuse_cmd += ["--client_fs={0}".format(mount_fs_name)] + fuse_cmd += mount_options + fuse_cmd += [ '--name', 'client.{id}'.format(id=self.client_id), # TODO ceph-fuse doesn't understand dash dash '--', diff --cc qa/tasks/vstart_runner.py index 05f795babc6d,660882a06e95..02f2da7cf96e --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@@ -854,10 -844,8 +854,10 @@@ class LocalFuseMount(FuseMount) prefix += ["--client_mountpoint={0}".format(mount_path)] if mount_fs_name is not None: - prefix += ["--client_mds_namespace={0}".format(mount_fs_name)] + prefix += ["--client_fs={0}".format(mount_fs_name)] + prefix += mount_options; + self.fuse_daemon = self.client_remote.run(args= prefix + [ "-f",