From 3b44f20ac0a889fdfc763d7ff1c824020aa784a4 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Thu, 25 Nov 2021 16:29:21 +0800 Subject: [PATCH] qa: move the optional client_config parameter to the end Fixes: https://tracker.ceph.com/issues/53216 Signed-off-by: Xiubo Li --- qa/tasks/cephfs/filesystem.py | 2 +- qa/tasks/cephfs/fuse_mount.py | 9 +++++---- qa/tasks/vstart_runner.py | 5 ++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qa/tasks/cephfs/filesystem.py b/qa/tasks/cephfs/filesystem.py index 9e079c9c80c..3f9b518a5a1 100644 --- a/qa/tasks/cephfs/filesystem.py +++ b/qa/tasks/cephfs/filesystem.py @@ -720,7 +720,7 @@ class Filesystem(MDSCluster): # avoid circular dep by importing here: from tasks.cephfs.fuse_mount import FuseMount d = misc.get_testdir(self._ctx) - m = FuseMount(self._ctx, {}, d, "admin", self.client_remote, cephfs_name=self.name) + m = FuseMount(self._ctx, d, "admin", self.client_remote, cephfs_name=self.name) m.mount_wait() m.run_shell_payload(cmd) m.umount_wait(require_clean=True) diff --git a/qa/tasks/cephfs/fuse_mount.py b/qa/tasks/cephfs/fuse_mount.py index 8ecaab7b78b..6c82379e26e 100644 --- a/qa/tasks/cephfs/fuse_mount.py +++ b/qa/tasks/cephfs/fuse_mount.py @@ -16,15 +16,16 @@ log = logging.getLogger(__name__) # Refer mount.py for docstrings. class FuseMount(CephFSMount): - def __init__(self, ctx, client_config, test_dir, client_id, - client_remote, client_keyring_path=None, cephfs_name=None, - cephfs_mntpt=None, hostfs_mntpt=None, brxnet=None): + def __init__(self, ctx, test_dir, client_id, client_remote, + client_keyring_path=None, cephfs_name=None, + cephfs_mntpt=None, hostfs_mntpt=None, brxnet=None, + client_config={}): super(FuseMount, self).__init__(ctx=ctx, test_dir=test_dir, client_id=client_id, client_remote=client_remote, client_keyring_path=client_keyring_path, hostfs_mntpt=hostfs_mntpt, cephfs_name=cephfs_name, cephfs_mntpt=cephfs_mntpt, brxnet=brxnet) - self.client_config = client_config if client_config else {} + self.client_config = client_config self.fuse_daemon = None self._fuse_conn = None self.id = None diff --git a/qa/tasks/vstart_runner.py b/qa/tasks/vstart_runner.py index 9a173846fd6..234ad1985df 100644 --- a/qa/tasks/vstart_runner.py +++ b/qa/tasks/vstart_runner.py @@ -713,9 +713,8 @@ class LocalFuseMount(LocalCephFSMount, FuseMount): def __init__(self, ctx, test_dir, client_id, client_keyring_path=None, client_remote=None, hostfs_mntpt=None, cephfs_name=None, cephfs_mntpt=None, brxnet=None): - super(LocalFuseMount, self).__init__(ctx=ctx, client_config=None, - test_dir=test_dir, client_id=client_id, - client_keyring_path=client_keyring_path, + super(LocalFuseMount, self).__init__(ctx=ctx, test_dir=test_dir, + client_id=client_id, client_keyring_path=client_keyring_path, client_remote=LocalRemote(), hostfs_mntpt=hostfs_mntpt, cephfs_name=cephfs_name, cephfs_mntpt=cephfs_mntpt, brxnet=brxnet) -- 2.39.5