From a5675535ba532cfe782238d995751f9bc91f5078 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 6 Oct 2021 16:37:34 -0400 Subject: [PATCH] qa: only set frag confs for workloads Otherwise these local conf overrides prevent functional testing. Signed-off-by: Patrick Donnelly --- qa/cephfs/conf/mds.yaml | 4 ---- qa/cephfs/overrides/frag.yaml | 9 +++++++++ qa/suites/fs/thrash/multifs/overrides/frag.yaml | 1 + qa/suites/fs/thrash/workloads/overrides/frag.yaml | 1 + qa/suites/fs/workload/overrides/frag.yaml | 1 + 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 qa/cephfs/overrides/frag.yaml create mode 120000 qa/suites/fs/thrash/multifs/overrides/frag.yaml create mode 120000 qa/suites/fs/thrash/workloads/overrides/frag.yaml create mode 120000 qa/suites/fs/workload/overrides/frag.yaml diff --git a/qa/cephfs/conf/mds.yaml b/qa/cephfs/conf/mds.yaml index 594590ec637..922f7167ae4 100644 --- a/qa/cephfs/conf/mds.yaml +++ b/qa/cephfs/conf/mds.yaml @@ -4,10 +4,6 @@ overrides: mds: debug mds: 20 debug ms: 1 - mds bal fragment size max: 10000 - mds bal merge size: 5 - mds bal split bits: 3 - mds bal split size: 100 mds debug frag: true mds debug scatterstat: true mds op complaint time: 180 diff --git a/qa/cephfs/overrides/frag.yaml b/qa/cephfs/overrides/frag.yaml new file mode 100644 index 00000000000..f05b3f48fe0 --- /dev/null +++ b/qa/cephfs/overrides/frag.yaml @@ -0,0 +1,9 @@ +overrides: + ceph: + conf: + mds: + mds bal fragment size max: 10000 + mds bal merge size: 5 + mds bal split bits: 3 + mds bal split size: 100 + diff --git a/qa/suites/fs/thrash/multifs/overrides/frag.yaml b/qa/suites/fs/thrash/multifs/overrides/frag.yaml new file mode 120000 index 00000000000..5e5cdaed8c7 --- /dev/null +++ b/qa/suites/fs/thrash/multifs/overrides/frag.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/frag.yaml \ No newline at end of file diff --git a/qa/suites/fs/thrash/workloads/overrides/frag.yaml b/qa/suites/fs/thrash/workloads/overrides/frag.yaml new file mode 120000 index 00000000000..5e5cdaed8c7 --- /dev/null +++ b/qa/suites/fs/thrash/workloads/overrides/frag.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/frag.yaml \ No newline at end of file diff --git a/qa/suites/fs/workload/overrides/frag.yaml b/qa/suites/fs/workload/overrides/frag.yaml new file mode 120000 index 00000000000..5e5cdaed8c7 --- /dev/null +++ b/qa/suites/fs/workload/overrides/frag.yaml @@ -0,0 +1 @@ +.qa/cephfs/overrides/frag.yaml \ No newline at end of file -- 2.39.5