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 <vshankar@redhat.com>
(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 c3b204537ab49327b097e7771d7b5b0572c79afe..350c4c163727d00aaac0a118425a8f8501efdcc2 100644 (file)
--- 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 24709ddcdabb36cc5ecf06521c43e38c06f4bad1..0f8a2a32d43799cda3fb9cb1bef6db85217055a6 100644 (file)
--- 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 = "/"