From 17fb7af533f51c121615a5c06431e1519fc62e29 Mon Sep 17 00:00:00 2001 From: Venky Shankar Date: Mon, 30 Jan 2023 19:46:35 +0530 Subject: [PATCH] qa: avoid explicit set to client mountpoint as "/" This causes self.cephfs_mntpt to set as "/" by default which overrides the config in ceph.conf. `test_client_cache_size` updates ceph.conf with: client mountpoint = /subdir However, the ceph-fuse mount command has --client_mountpoint explicitly set as "/", thereby causing the root of the file system to get mounted which confuses the test. Fixes: http://tracker.ceph.com/issues/56446 Introduced-by: bf83eaa4e75516a6937e4097b8708c48856a9473 Signed-off-by: Venky Shankar (cherry picked from commit 4322dcc2e94bab80042eaf1e236174f6e6772cec) --- qa/tasks/cephfs/fuse_mount.py | 4 ++-- qa/tasks/cephfs/kernel_mount.py | 2 ++ qa/tasks/cephfs/mount.py | 3 --- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py index 731e9f66ac9..0b9b1740386 100644 --- a/qa/tasks/cephfs/fuse_mount.py +++ b/qa/tasks/cephfs/fuse_mount.py @@ -114,8 +114,8 @@ class FuseMount(CephFSMount): self.validate_subvol_options() - assert(self.cephfs_mntpt) - mount_cmd += ["--client_mountpoint=" + self.cephfs_mntpt] + if self.cephfs_mntpt: + mount_cmd += ["--client_mountpoint=" + self.cephfs_mntpt] if self.cephfs_name: mount_cmd += ["--client_fs=" + self.cephfs_name] diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py index 0f0a7cdf7fe..750b6b5335a 100644 --- a/qa/tasks/cephfs/kernel_mount.py +++ b/qa/tasks/cephfs/kernel_mount.py @@ -49,6 +49,8 @@ class KernelMount(CephFSMount): self.setup_netns() + if not self.cephfs_mntpt: + self.cephfs_mntpt = '/' if not self.cephfs_name: self.cephfs_name = 'cephfs' diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index e9341141f63..0c3635f3686 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -1503,6 +1503,3 @@ class CephFSMount(object): subvol_paths = self.ctx.created_subvols[self.cephfs_name] path_to_mount = subvol_paths[mount_subvol_num] self.cephfs_mntpt = path_to_mount - elif not self.cephfs_mntpt: - # default to the "/" path - self.cephfs_mntpt = "/" -- 2.39.5