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
	- merge conflicts due to updated upstream code
	- removed offending line; host_mntpt was appended to the mount command
	  later in the code; this issue was created due to manual conflict
	  resolution during backporting process;
	qa/tasks/cephfs/kernel_mount.py
	qa/tasks/cephfs/mount.py
	- fixed conflicts between 'main' and 'pacific' branches

diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py
index 982a5553496f7cfaaf28f42c466a2472133016bd..e87f6ad9eb5f49a7b8eff66c3f0c38d080df1747 100644 (file)
--- a/qa/tasks/cephfs/fuse_mount.py
+++ b/qa/tasks/cephfs/fuse_mount.py
@@ -85,7 +85,9 @@ class FuseMount(CephFSMount):
             fuse_cmd += ['--id', self.client_id]
         if self.client_keyring_path and self.client_id is not None:
             fuse_cmd += ['-k', self.client_keyring_path]
+
         self.validate_subvol_options()
+
         if self.cephfs_mntpt is not None:
             fuse_cmd += ["--client_mountpoint=" + self.cephfs_mntpt]
         if self.cephfs_name is not None:

diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py
index eb9fdfd2ec173f66f75d054bc32c7016c6f21aaf..b6c16428164dfd7d45b3f7ba11935084da854d82 100644 (file)
--- a/qa/tasks/cephfs/mount.py
+++ b/qa/tasks/cephfs/mount.py
@@ -1403,6 +1403,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 = "/"