From: Venky Shankar Date: Mon, 30 Jan 2023 14:16:35 +0000 (+0530) Subject: qa: avoid explicit set to client mountpoint as "/" X-Git-Tag: v17.2.7~154^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a265064ef462bdbacb3c5266f081af5d9c96faa1;p=ceph.git 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) Conflicts: qa/tasks/cephfs/fuse_mount.py qa/tasks/cephfs/mount.py - fixed 'main' and 'quincy' branch conflicts --- diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py index c3b204537ab..350c4c16372 100644 --- a/qa/tasks/cephfs/fuse_mount.py +++ b/qa/tasks/cephfs/fuse_mount.py @@ -116,8 +116,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/mount.py b/qa/tasks/cephfs/mount.py index 24709ddcdab..0f8a2a32d43 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -1434,6 +1434,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 = "/"