From db0b85b44076ef952ca71033f3b5b819b8d768af Mon Sep 17 00:00:00 2001 From: Rishabh Dave Date: Fri, 19 Feb 2021 21:33:45 +0530 Subject: [PATCH] qa/cephfs: remove parameter createfs from mount classes It's better to get rid of this paramter since it doesn't actually create any new Ceph file system. Signed-off-by: Rishabh Dave --- qa/tasks/cephfs/fuse_mount.py | 8 +------- qa/tasks/cephfs/kernel_mount.py | 7 +------ qa/tasks/cephfs/mount.py | 11 ++++------- qa/tasks/vstart_runner.py | 11 ++--------- 4 files changed, 8 insertions(+), 29 deletions(-) diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py index 711a397866917..0001b922c63fd 100644 --- a/qa/tasks/cephfs/fuse_mount.py +++ b/qa/tasks/cephfs/fuse_mount.py @@ -31,18 +31,12 @@ class FuseMount(CephFSMount): self.inst = None self.addr = None - def mount(self, mntopts=[], createfs=True, check_status=True, **kwargs): + def mount(self, mntopts=[], check_status=True, **kwargs): self.update_attrs(**kwargs) self.assert_and_log_minimum_mount_details() self.setup_netns() - if createfs: - # TODO: don't call setupfs() from within mount(), since it's - # absurd. The proper order should be: create FS first and then - # call mount(). - self.setupfs(name=self.cephfs_name) - try: return self._mount(mntopts, check_status) except RuntimeError: diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py index 9845454199ad7..fc6e97dc50a69 100644 --- a/qa/tasks/cephfs/kernel_mount.py +++ b/qa/tasks/cephfs/kernel_mount.py @@ -30,17 +30,12 @@ class KernelMount(CephFSMount): self.inst = None self.addr = None - def mount(self, mntopts=[], createfs=True, check_status=True, **kwargs): + def mount(self, mntopts=[], check_status=True, **kwargs): self.update_attrs(**kwargs) self.assert_and_log_minimum_mount_details() self.setup_netns() - # TODO: don't call setupfs() from within mount(), since it's - # absurd. The proper order should be: create FS first and then - # call mount(). - if createfs: - self.setupfs(name=self.cephfs_name) if not self.cephfs_mntpt: self.cephfs_mntpt = '/' diff --git a/qa/tasks/cephfs/mount.py b/qa/tasks/cephfs/mount.py index 95e4063f762ad..566e530d9c7c1 100644 --- a/qa/tasks/cephfs/mount.py +++ b/qa/tasks/cephfs/mount.py @@ -395,7 +395,7 @@ class CephFSMount(object): args = ['sudo', 'ip', 'link', 'set', 'brx.{0}'.format(self.nsid), 'up'] self.client_remote.run(args=args, timeout=(5*60), omit_sudo=False) - def mount(self, mntopts=[], createfs=True, check_status=True, **kwargs): + def mount(self, mntopts=[], check_status=True, **kwargs): """ kwargs expects its members to be same as the arguments accepted by self.update_attrs(). @@ -469,22 +469,19 @@ class CephFSMount(object): 2. Run update_attrs(). 3. Run mount(). - Accepts arguments of self.mount() and self.update_attrs() with 2 exceptions - - 1. Accepts wait too which can be True or False. - 2. The default value of createfs is False. + Accepts arguments of self.mount() and self.update_attrs() with 1 + exception: wait accepted too which can be True or False. """ self.umount_wait() assert not self.mounted mntopts = kwargs.pop('mntopts', []) - createfs = kwargs.pop('createfs', False) check_status = kwargs.pop('check_status', True) wait = kwargs.pop('wait', True) self.update_attrs(**kwargs) - retval = self.mount(mntopts=mntopts, createfs=createfs, - check_status=check_status) + retval = self.mount(mntopts=mntopts, check_status=check_status) # avoid this scenario (again): mount command might've failed and # check_status might have silenced the exception, yet we attempt to # wait which might lead to an error. diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 8c7cd32cf56ed..5d9c095c546d7 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -666,7 +666,7 @@ class LocalKernelMount(KernelMount): path = "{0}/client.{1}.*.asok".format(d, self.client_id) return path - def mount(self, mntopts=[], createfs=True, check_status=True, **kwargs): + def mount(self, mntopts=[], check_status=True, **kwargs): self.update_attrs(**kwargs) self.assert_and_log_minimum_mount_details() @@ -678,9 +678,6 @@ class LocalKernelMount(KernelMount): if not self.cephfs_mntpt: self.cephfs_mntpt = "/" - # TODO: don't call setupfs() from within mount() - if createfs: - self.setupfs(name=self.cephfs_name) opts = 'norequire_active_mds' if self.client_id: @@ -800,7 +797,7 @@ class LocalFuseMount(FuseMount): path = "{0}/client.{1}.*.asok".format(d, self.client_id) return path - def mount(self, mntopts=[], createfs=True, check_status=True, **kwargs): + def mount(self, mntopts=[], check_status=True, **kwargs): self.update_attrs(**kwargs) self.assert_and_log_minimum_mount_details() @@ -810,10 +807,6 @@ class LocalFuseMount(FuseMount): else: self.using_namespace = False - # TODO: don't call setupfs() from within mount() - if createfs: - self.setupfs(name=self.cephfs_name) - stderr = StringIO() try: self.client_remote.run(args=['mkdir', '-p', self.hostfs_mntpt], -- 2.39.5