From: Deepika Upadhyay Date: Fri, 12 Mar 2021 16:21:32 +0000 (+0530) Subject: qa/suites/upgrade: s/whitelist/ignorelist for octopus only X-Git-Tag: v15.2.10~3^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F40074%2Fhead;p=ceph.git qa/suites/upgrade: s/whitelist/ignorelist for octopus only some upgrade tests are only present for octopus and not for master and hence we missed updating the ignorelist terminology for those cases. Signed-off-by: Deepika Upadhyay --- diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml index 5c5fdc0b2c5..b245534eb02 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel-v1only.yaml @@ -1,7 +1,7 @@ overrides: ceph: mon_bind_msgr2: false - log-whitelist: + log-ignorelist: - \(MON_DOWN\) conf: global: diff --git a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml index fea79d4a70b..c74015b09c0 100644 --- a/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml +++ b/qa/suites/rados/thrash-old-clients/1-install/jewel.yaml @@ -1,7 +1,7 @@ overrides: ceph: mon_bind_msgr2: false - log-whitelist: + log-ignorelist: - \(MON_DOWN\) conf: global: diff --git a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml index c631b0ed2df..8354b1772bd 100644 --- a/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml +++ b/qa/suites/upgrade-clients/client-upgrade-octopus-pacific/octopus-client-x/rbd/0-cluster/start.yaml @@ -16,6 +16,6 @@ roles: - - client.1 overrides: ceph: - #log-whitelist: + #log-ignorelist: #- failed to encode map fs: xfs diff --git a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml index bfc14e560af..f1ae68180b7 100644 --- a/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/1-install/mimic.yaml @@ -1,6 +1,6 @@ overrides: ceph: - log-whitelist: + log-ignorelist: - \(MON_DOWN\) - \(MGR_DOWN\) - slow request diff --git a/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml b/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml index e36882da43f..5360e867fcc 100644 --- a/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/3-thrash/default.yaml @@ -4,7 +4,7 @@ meta: small chance to increase the number of pgs overrides: ceph: - log-whitelist: + log-ignorelist: - but it is still running - objects unfound and apparently lost - log bound mismatch diff --git a/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml b/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml index e7fa4b2f47c..3f72ccaa682 100644 --- a/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml +++ b/qa/suites/upgrade/mimic-x-singleton/6-finish-upgrade.yaml @@ -4,7 +4,7 @@ meta: restartin remaining osds overrides: ceph: - log-whitelist: + log-ignorelist: - overall HEALTH_ - \(FS_DEGRADED\) - \(MDS_ diff --git a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml index 099b70c30d8..f7f8f4a980d 100644 --- a/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/0-cluster/start.yaml @@ -29,7 +29,7 @@ overrides: ceph: mon_bind_msgr2: false mon_bind_addrvec: false - log-whitelist: + log-ignorelist: - scrub mismatch - ScrubResult - wrongly marked diff --git a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml index f4a882583aa..0abc11e7f5d 100644 --- a/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/1-ceph-install/mimic.yaml @@ -16,7 +16,7 @@ tasks: extra_packages: ['librados2'] - print: "**** done installing mimic" - ceph: - log-whitelist: + log-ignorelist: - overall HEALTH_ - \(FS_ - \(MDS_ diff --git a/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml b/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml index 129d13866ce..08706dfc177 100644 --- a/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml +++ b/qa/suites/upgrade/mimic-x/parallel/6-final-workload/rados_mon_thrash.yaml @@ -3,7 +3,7 @@ meta: librados C and C++ api tests overrides: ceph: - log-whitelist: + log-ignorelist: - reached quota - \(REQUEST_SLOW\) tasks: diff --git a/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml b/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml index b12d76e9fe6..4f15c64848b 100644 --- a/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split-erasure-code/3-thrash/default.yaml @@ -4,7 +4,7 @@ meta: small chance to increase the number of pgs overrides: ceph: - log-whitelist: + log-ignorelist: - but it is still running - wrongly marked me down - objects unfound and apparently lost diff --git a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml b/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml index 433f3534567..2583082bba8 100644 --- a/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split/0-cluster/start.yaml @@ -11,7 +11,7 @@ overrides: mon_bind_msgr2: false mon_bind_addrvec: false fs: xfs - log-whitelist: + log-ignorelist: - overall HEALTH_ - \(MON_DOWN\) - \(MGR_DOWN\) diff --git a/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml b/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml index e0f317b0c1a..2be9c1f29ac 100644 --- a/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml +++ b/qa/suites/upgrade/mimic-x/stress-split/3-thrash/default.yaml @@ -4,7 +4,7 @@ meta: small chance to increase the number of pgs overrides: ceph: - log-whitelist: + log-ignorelist: - but it is still running - wrongly marked me down - objects unfound and apparently lost diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml index 165076b017b..ad97ea42246 100644 --- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml +++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-parallel/point-to-point-upgrade.yaml @@ -11,7 +11,7 @@ meta: run workload and upgrade-sequence in parallel overrides: ceph: - log-whitelist: + log-ignorelist: - reached quota - scrub - osd_map_max_advance diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml index 5ebce3ced08..1271edd8b91 100644 --- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml +++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/0-cluster/start.yaml @@ -6,7 +6,7 @@ meta: overrides: ceph: fs: xfs - log-whitelist: + log-ignorelist: - overall HEALTH_ - \(MON_DOWN\) - \(MGR_DOWN\) diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml index 49e6f84f86a..c739d8fea2b 100644 --- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml +++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/3-thrash/default.yaml @@ -4,7 +4,7 @@ meta: small chance to increase the number of pgs overrides: ceph: - log-whitelist: + log-ignorelist: - but it is still running - wrongly marked me down - objects unfound and apparently lost diff --git a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml index 914f6e25ee5..9903fa578af 100644 --- a/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml +++ b/qa/suites/upgrade/octopus-p2p/octopus-p2p-stress-split/thrashosds-health.yaml @@ -1,6 +1,6 @@ overrides: ceph: - log-whitelist: + log-ignorelist: - overall HEALTH_ - \(OSDMAP_FLAGS\) - \(OSD_