From: David Zafman Date: Fri, 18 May 2018 00:30:32 +0000 (-0700) Subject: test: Need to escape parens in log-whitelist for grep X-Git-Tag: v12.2.6~98^2~3 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=36eed58b2ab9f554e32320520eebfd1f1c17b0ed;p=ceph.git test: Need to escape parens in log-whitelist for grep Signed-off-by: David Zafman (cherry picked from commit a9e43ed85236c8412679da58d068253e80d21d05) Conflicts: qa/suites/rados/monthrash/ceph.yaml (no changes needed) Additional changes for luminous: qa/suites/rados/basic/tasks/rados_api_tests.yaml qa/suites/rados/singleton/all/thrash-eio.yaml qa/suites/smoke/basic/tasks/rados_api_tests.yaml --- diff --git a/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml b/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml index f79784c0bed6..7fdee84b1f89 100644 --- a/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml +++ b/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml @@ -6,7 +6,7 @@ overrides: - Metadata damage detected - bad backtrace on inode - overall HEALTH_ - - (MDS_TRIM) + - \(MDS_TRIM\) conf: mds: mds log max segments: 1 diff --git a/qa/suites/rados/basic-luminous/scrub_test.yaml b/qa/suites/rados/basic-luminous/scrub_test.yaml index 268fd01ea439..39821ad86727 100644 --- a/qa/suites/rados/basic-luminous/scrub_test.yaml +++ b/qa/suites/rados/basic-luminous/scrub_test.yaml @@ -16,11 +16,11 @@ overrides: - 'deep-scrub 1 missing, 0 inconsistent objects' - 'failed to pick suitable auth object' - overall HEALTH_ - - (OSDMAP_FLAGS) - - (OSD_ - - (PG_ - - (OSD_SCRUB_ERRORS) - - (TOO_FEW_PGS) + - \(OSDMAP_FLAGS\) + - \(OSD_ + - \(PG_ + - \(OSD_SCRUB_ERRORS\) + - \(TOO_FEW_PGS\) conf: osd: osd deep scrub update digest min age: 0 diff --git a/qa/suites/rados/basic/tasks/repair_test.yaml b/qa/suites/rados/basic/tasks/repair_test.yaml index 9afbc0417b00..da765b018a45 100644 --- a/qa/suites/rados/basic/tasks/repair_test.yaml +++ b/qa/suites/rados/basic/tasks/repair_test.yaml @@ -18,9 +18,9 @@ overrides: - attr name mismatch - Regular scrub request, deep-scrub details will be lost - overall HEALTH_ - - (OSDMAP_FLAGS) - - (OSD_ - - (PG_ + - \(OSDMAP_FLAGS\) + - \(OSD_ + - \(PG_ conf: osd: filestore debug inject read err: true diff --git a/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml b/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml index ec761e2955ee..a4cea8f3aeda 100644 --- a/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml +++ b/qa/suites/rados/multimon/tasks/mon_clock_no_skews.yaml @@ -6,6 +6,6 @@ tasks: - .*clock.*skew.* - clocks not synchronized - overall HEALTH_ - - (MON_CLOCK_SKEW) + - \(MON_CLOCK_SKEW\) - mon_clock_skew_check: expect-skew: false diff --git a/qa/suites/rados/singleton-bluestore/all/cephtool.yaml b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml index 77eed22d4707..0a32ad258489 100644 --- a/qa/suites/rados/singleton-bluestore/all/cephtool.yaml +++ b/qa/suites/rados/singleton-bluestore/all/cephtool.yaml @@ -22,10 +22,10 @@ tasks: - failsafe engaged, dropping updates - failsafe disengaged, no longer dropping updates - overall HEALTH_ - - (OSDMAP_FLAGS) - - (OSD_ - - (PG_ - - (SMALLER_PG_NUM) + - \(OSDMAP_FLAGS\) + - \(OSD_ + - \(PG_ + - \(SMALLER_PG_NUM\) - workunit: clients: all: diff --git a/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml b/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml index bbf330b0ba1f..dfe35bc442db 100644 --- a/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml +++ b/qa/suites/rados/singleton-nomsgr/all/admin_socket_output.yaml @@ -6,10 +6,10 @@ overrides: - MDS in read-only mode - force file system read-only - overall HEALTH_ - - (OSDMAP_FLAGS) - - (OSD_FULL) - - (MDS_READ_ONLY) - - (POOL_FULL) + - \(OSDMAP_FLAGS\) + - \(OSD_FULL\) + - \(MDS_READ_ONLY\) + - \(POOL_FULL\) tasks: - install: - ceph: diff --git a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml index 10f18e2ea473..3ada5518f57b 100644 --- a/qa/suites/rados/singleton/all/pg-removal-interruption.yaml +++ b/qa/suites/rados/singleton/all/pg-removal-interruption.yaml @@ -16,9 +16,9 @@ tasks: - but it is still running - slow request - overall HEALTH_ - - (OSDMAP_FLAGS) - - (OSD_ - - (PG_ + - \(OSDMAP_FLAGS\) + - \(OSD_ + - \(PG_ - exec: client.0: - sudo ceph osd pool create foo 128 128 diff --git a/qa/suites/rados/singleton/all/random-eio.yaml b/qa/suites/rados/singleton/all/random-eio.yaml index 96b2208d1b2f..71e85649e96d 100644 --- a/qa/suites/rados/singleton/all/random-eio.yaml +++ b/qa/suites/rados/singleton/all/random-eio.yaml @@ -19,8 +19,8 @@ tasks: - missing primary copy of - objects unfound and apparently lost - overall HEALTH_ - - (POOL_APP_NOT_ENABLED) - - (PG_DEGRADED) + - \(POOL_APP_NOT_ENABLED\) + - \(PG_DEGRADED\) - full_sequential: - exec: client.0: diff --git a/qa/suites/rados/singleton/all/thrash-eio.yaml b/qa/suites/rados/singleton/all/thrash-eio.yaml index cac3cb3b792d..e184d911da3d 100644 --- a/qa/suites/rados/singleton/all/thrash-eio.yaml +++ b/qa/suites/rados/singleton/all/thrash-eio.yaml @@ -25,11 +25,11 @@ tasks: - missing primary copy of - objects unfound and apparently lost - overall HEALTH_ - - (OSDMAP_FLAGS) - - (REQUEST_SLOW) - - (PG_ + - \(OSDMAP_FLAGS\) + - \(REQUEST_SLOW\) + - \(PG_ - \(OBJECT_MISPLACED\) - - (OSD_ + - \(OSD_ - thrashosds: op_delay: 30 clean_interval: 120 diff --git a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml index 82c9b2d0c73b..c0b270758f80 100644 --- a/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml +++ b/qa/suites/rados/singleton/all/thrash_cache_writeback_proxy_none.yaml @@ -19,7 +19,7 @@ tasks: - but it is still running - slow request - overall HEALTH_ - - (CACHE_POOL_ + - \(CACHE_POOL_ - exec: client.0: - sudo ceph osd pool create base 4 diff --git a/qa/suites/rbd/openstack/base/install.yaml b/qa/suites/rbd/openstack/base/install.yaml index 90f80dcf2b85..740d32c00cd1 100644 --- a/qa/suites/rbd/openstack/base/install.yaml +++ b/qa/suites/rbd/openstack/base/install.yaml @@ -4,4 +4,4 @@ tasks: overrides: ceph: log-whitelist: - - (POOL_APP_NOT_ENABLED) + - \(POOL_APP_NOT_ENABLED\) diff --git a/qa/suites/rbd/thrash/thrashers/cache.yaml b/qa/suites/rbd/thrash/thrashers/cache.yaml index e723e0929e09..24956484165f 100644 --- a/qa/suites/rbd/thrash/thrashers/cache.yaml +++ b/qa/suites/rbd/thrash/thrashers/cache.yaml @@ -4,8 +4,8 @@ overrides: - but it is still running - objects unfound and apparently lost - overall HEALTH_ - - (CACHE_POOL_NEAR_FULL) - - (CACHE_POOL_NO_HIT_SET) + - \(CACHE_POOL_NEAR_FULL\) + - \(CACHE_POOL_NO_HIT_SET\) tasks: - exec: client.0: diff --git a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml index d17f60db104c..df28ed6a2c96 100644 --- a/qa/suites/smoke/basic/tasks/rados_api_tests.yaml +++ b/qa/suites/smoke/basic/tasks/rados_api_tests.yaml @@ -6,7 +6,7 @@ tasks: - reached quota - but it is still running - objects unfound and apparently lost - - (POOL_APP_NOT_ENABLED) + - \(POOL_APP_NOT_ENABLED\) - thrashosds: chance_pgnum_grow: 2 chance_pgpnum_fix: 1 diff --git a/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml index f5a883a3927d..4d10158b71ba 100644 --- a/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/kraken-x/parallel/0-cluster/start.yaml @@ -25,7 +25,7 @@ overrides: - scrub mismatch - ScrubResult - wrongly marked - - (POOL_APP_NOT_ENABLED) + - \(POOL_APP_NOT_ENABLED\) - overall HEALTH_ conf: global: diff --git a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml index 3684b1e0a0af..f8732212dc2b 100644 --- a/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml +++ b/qa/suites/upgrade/luminous-x/parallel/0-cluster/start.yaml @@ -25,7 +25,7 @@ overrides: - scrub mismatch - ScrubResult - wrongly marked - - (POOL_APP_NOT_ENABLED) + - \(POOL_APP_NOT_ENABLED\) - overall HEALTH_ conf: global: