From 49abce22909f1f378034e06ea0b83ef063b38989 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 3 Sep 2020 20:33:01 -0700 Subject: [PATCH] qa: move log-rotate config to common yaml Fixes: https://tracker.ceph.com/issues/23718 Signed-off-by: Patrick Donnelly --- qa/cephfs/begin.yaml | 3 +++ qa/cephfs/clusters/1-mds-1-client-coloc.yaml | 3 --- qa/cephfs/clusters/1-mds-1-client.yaml | 3 --- qa/cephfs/clusters/1-mds-2-client-coloc.yaml | 3 --- qa/cephfs/clusters/1-mds-2-client.yaml | 3 --- qa/cephfs/clusters/1-mds-3-client.yaml | 3 --- qa/cephfs/clusters/1-mds-4-client-coloc.yaml | 3 --- qa/cephfs/clusters/1-mds-4-client.yaml | 3 --- qa/cephfs/clusters/1a3s-mds-1c-client.yaml | 3 --- qa/cephfs/clusters/1a3s-mds-2c-client.yaml | 3 --- qa/cephfs/clusters/3-mds.yaml | 3 --- qa/cephfs/clusters/9-mds.yaml | 3 --- qa/cephfs/clusters/fixed-2-ucephfs.yaml | 3 --- qa/cephfs/overrides/log-config.yaml | 3 --- qa/suites/kcephfs/cephfs/overrides/log-config.yaml | 1 - qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml | 1 - qa/suites/kcephfs/multifs/overrides/log-config.yaml | 1 - qa/suites/kcephfs/recovery/overrides/log-config.yaml | 1 - qa/suites/kcephfs/thrash/overrides/log-config.yaml | 1 - 19 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 qa/cephfs/overrides/log-config.yaml delete mode 120000 qa/suites/kcephfs/cephfs/overrides/log-config.yaml delete mode 120000 qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml delete mode 120000 qa/suites/kcephfs/multifs/overrides/log-config.yaml delete mode 120000 qa/suites/kcephfs/recovery/overrides/log-config.yaml delete mode 120000 qa/suites/kcephfs/thrash/overrides/log-config.yaml diff --git a/qa/cephfs/begin.yaml b/qa/cephfs/begin.yaml index 56156886c1f68..082f295406700 100644 --- a/qa/cephfs/begin.yaml +++ b/qa/cephfs/begin.yaml @@ -1,3 +1,6 @@ +log-rotate: + ceph-mds: 10G + ceph-osd: 10G tasks: - install: extra_packages: diff --git a/qa/cephfs/clusters/1-mds-1-client-coloc.yaml b/qa/cephfs/clusters/1-mds-1-client-coloc.yaml index 5fcb3d571c753..d295dc3d37ece 100644 --- a/qa/cephfs/clusters/1-mds-1-client-coloc.yaml +++ b/qa/cephfs/clusters/1-mds-1-client-coloc.yaml @@ -7,6 +7,3 @@ openstack: size: 20 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-1-client.yaml b/qa/cephfs/clusters/1-mds-1-client.yaml index 437a384752ab7..d7701815f6549 100644 --- a/qa/cephfs/clusters/1-mds-1-client.yaml +++ b/qa/cephfs/clusters/1-mds-1-client.yaml @@ -8,6 +8,3 @@ openstack: size: 20 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-2-client-coloc.yaml b/qa/cephfs/clusters/1-mds-2-client-coloc.yaml index ac3c00d4d338e..5ce128cbd600b 100644 --- a/qa/cephfs/clusters/1-mds-2-client-coloc.yaml +++ b/qa/cephfs/clusters/1-mds-2-client-coloc.yaml @@ -7,6 +7,3 @@ openstack: size: 20 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-2-client.yaml b/qa/cephfs/clusters/1-mds-2-client.yaml index d78bc7accee42..6e996244e21e8 100644 --- a/qa/cephfs/clusters/1-mds-2-client.yaml +++ b/qa/cephfs/clusters/1-mds-2-client.yaml @@ -9,6 +9,3 @@ openstack: size: 30 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-3-client.yaml b/qa/cephfs/clusters/1-mds-3-client.yaml index b78d42209e910..200df1fe0caa6 100644 --- a/qa/cephfs/clusters/1-mds-3-client.yaml +++ b/qa/cephfs/clusters/1-mds-3-client.yaml @@ -10,6 +10,3 @@ openstack: size: 30 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-4-client-coloc.yaml b/qa/cephfs/clusters/1-mds-4-client-coloc.yaml index dca03d76228c6..3e2ee78703f2d 100644 --- a/qa/cephfs/clusters/1-mds-4-client-coloc.yaml +++ b/qa/cephfs/clusters/1-mds-4-client-coloc.yaml @@ -7,6 +7,3 @@ openstack: size: 30 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1-mds-4-client.yaml b/qa/cephfs/clusters/1-mds-4-client.yaml index 70dd6813ab1ff..9addfe3b041c9 100644 --- a/qa/cephfs/clusters/1-mds-4-client.yaml +++ b/qa/cephfs/clusters/1-mds-4-client.yaml @@ -11,6 +11,3 @@ openstack: size: 30 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1a3s-mds-1c-client.yaml b/qa/cephfs/clusters/1a3s-mds-1c-client.yaml index 2b36c9d82399f..87867daa4a4ec 100644 --- a/qa/cephfs/clusters/1a3s-mds-1c-client.yaml +++ b/qa/cephfs/clusters/1a3s-mds-1c-client.yaml @@ -7,6 +7,3 @@ openstack: size: 20 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/1a3s-mds-2c-client.yaml b/qa/cephfs/clusters/1a3s-mds-2c-client.yaml index 4be15ea161ba9..ba17f05d2b2cc 100644 --- a/qa/cephfs/clusters/1a3s-mds-2c-client.yaml +++ b/qa/cephfs/clusters/1a3s-mds-2c-client.yaml @@ -7,6 +7,3 @@ openstack: size: 20 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/3-mds.yaml b/qa/cephfs/clusters/3-mds.yaml index edfec5e19a375..8dfacb4e7d6b3 100644 --- a/qa/cephfs/clusters/3-mds.yaml +++ b/qa/cephfs/clusters/3-mds.yaml @@ -12,6 +12,3 @@ openstack: size: 30 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/9-mds.yaml b/qa/cephfs/clusters/9-mds.yaml index fd69e32bcea70..60b18c251d7a2 100644 --- a/qa/cephfs/clusters/9-mds.yaml +++ b/qa/cephfs/clusters/9-mds.yaml @@ -12,6 +12,3 @@ openstack: size: 30 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/clusters/fixed-2-ucephfs.yaml b/qa/cephfs/clusters/fixed-2-ucephfs.yaml index f55f031ae5f2a..dff37a51fe324 100644 --- a/qa/cephfs/clusters/fixed-2-ucephfs.yaml +++ b/qa/cephfs/clusters/fixed-2-ucephfs.yaml @@ -7,6 +7,3 @@ openstack: size: 30 # GB - machine: disk: 200 # GB -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/cephfs/overrides/log-config.yaml b/qa/cephfs/overrides/log-config.yaml deleted file mode 100644 index 3b876f13b6ade..0000000000000 --- a/qa/cephfs/overrides/log-config.yaml +++ /dev/null @@ -1,3 +0,0 @@ -log-rotate: - ceph-mds: 10G - ceph-osd: 10G diff --git a/qa/suites/kcephfs/cephfs/overrides/log-config.yaml b/qa/suites/kcephfs/cephfs/overrides/log-config.yaml deleted file mode 120000 index d955aa5ba867c..0000000000000 --- a/qa/suites/kcephfs/cephfs/overrides/log-config.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/log-config.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml b/qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml deleted file mode 120000 index d955aa5ba867c..0000000000000 --- a/qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/log-config.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/multifs/overrides/log-config.yaml b/qa/suites/kcephfs/multifs/overrides/log-config.yaml deleted file mode 120000 index d955aa5ba867c..0000000000000 --- a/qa/suites/kcephfs/multifs/overrides/log-config.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/log-config.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/recovery/overrides/log-config.yaml b/qa/suites/kcephfs/recovery/overrides/log-config.yaml deleted file mode 120000 index d955aa5ba867c..0000000000000 --- a/qa/suites/kcephfs/recovery/overrides/log-config.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/log-config.yaml \ No newline at end of file diff --git a/qa/suites/kcephfs/thrash/overrides/log-config.yaml b/qa/suites/kcephfs/thrash/overrides/log-config.yaml deleted file mode 120000 index d955aa5ba867c..0000000000000 --- a/qa/suites/kcephfs/thrash/overrides/log-config.yaml +++ /dev/null @@ -1 +0,0 @@ -.qa/cephfs/overrides/log-config.yaml \ No newline at end of file -- 2.39.5