From b44ee81e7e854f8ae7a8eabe405e5b78f5898f26 Mon Sep 17 00:00:00 2001 From: Xiubo Li Date: Thu, 25 Nov 2021 16:30:12 +0800 Subject: [PATCH] qa: rename and save the client_config for kernel mount Fixes: https://tracker.ceph.com/issues/53216 Signed-off-by: Xiubo Li --- qa/tasks/cephfs/kernel_mount.py | 10 ++++++---- qa/tasks/kclient.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/qa/tasks/cephfs/kernel_mount.py b/qa/tasks/cephfs/kernel_mount.py index 26320982a9749..99ed318ff6c16 100644 --- a/qa/tasks/cephfs/kernel_mount.py +++ b/qa/tasks/cephfs/kernel_mount.py @@ -22,15 +22,17 @@ DEBUGFS_META_DIR = 'meta' class KernelMount(CephFSMount): def __init__(self, ctx, test_dir, client_id, client_remote, client_keyring_path=None, hostfs_mntpt=None, - cephfs_name=None, cephfs_mntpt=None, brxnet=None, config={}): + cephfs_name=None, cephfs_mntpt=None, brxnet=None, + client_config={}): super(KernelMount, 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.dynamic_debug = config.get('dynamic_debug', False) - self.rbytes = config.get('rbytes', False) - self.syntax_style = config.get('syntax', 'v2') + self.client_config = client_config + self.dynamic_debug = client_config.get('dynamic_debug', False) + self.rbytes = client_config.get('rbytes', False) + self.syntax_style = client_config.get('syntax', 'v2') self.inst = None self.addr = None self._mount_bin = ['adjust-ulimits', 'ceph-coverage', self.test_dir +\ diff --git a/qa/tasks/kclient.py b/qa/tasks/kclient.py index 2749f01daeef1..ca202df71213c 100644 --- a/qa/tasks/kclient.py +++ b/qa/tasks/kclient.py @@ -100,7 +100,7 @@ def task(ctx, config): client_id=id_, client_remote=remote, brxnet=ctx.teuthology_config.get('brxnet', None), - config=client_config, + client_config=client_config, cephfs_name=cephfs_name) mounts[id_] = kernel_mount -- 2.39.5