From: Sage Weil Date: Mon, 10 Jul 2017 16:25:23 +0000 (-0400) Subject: qa/suites/rbd: whitelist health messages X-Git-Tag: v12.1.1~58^2~6 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3d268d6e83208ee0b06a88f5e1cc576aaa511fd9;p=ceph.git qa/suites/rbd: whitelist health messages Signed-off-by: Sage Weil --- diff --git a/qa/suites/rbd/basic/cachepool/small.yaml b/qa/suites/rbd/basic/cachepool/small.yaml index 8262be330446..5c8f924abadc 100644 --- a/qa/suites/rbd/basic/cachepool/small.yaml +++ b/qa/suites/rbd/basic/cachepool/small.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - exec: client.0: diff --git a/qa/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml b/qa/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml index a98768540ba9..9d34002a1588 100644 --- a/qa/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml +++ b/qa/suites/rbd/basic/tasks/rbd_api_tests_old_format.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml b/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml index 263b784e27dd..f60a5ffa7e1b 100644 --- a/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml +++ b/qa/suites/rbd/basic/tasks/rbd_python_api_tests_old_format.yaml @@ -1,3 +1,7 @@ +overrides: + ceph: + log-whitelist: + - (REQUEST_SLOW) tasks: - workunit: clients: diff --git a/qa/suites/rbd/cli/pool/ec-data-pool.yaml b/qa/suites/rbd/cli/pool/ec-data-pool.yaml index 75dfc6a45534..32dd2ab90792 100644 --- a/qa/suites/rbd/cli/pool/ec-data-pool.yaml +++ b/qa/suites/rbd/cli/pool/ec-data-pool.yaml @@ -11,6 +11,9 @@ overrides: bdev_inject_crash_probability: .5 ceph: fs: xfs + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) conf: client: rbd default data pool: datapool diff --git a/qa/suites/rbd/cli/pool/small-cache-pool.yaml b/qa/suites/rbd/cli/pool/small-cache-pool.yaml index 8262be330446..5c8f924abadc 100644 --- a/qa/suites/rbd/cli/pool/small-cache-pool.yaml +++ b/qa/suites/rbd/cli/pool/small-cache-pool.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - exec: client.0: diff --git a/qa/suites/rbd/librbd/pool/small-cache-pool.yaml b/qa/suites/rbd/librbd/pool/small-cache-pool.yaml index 8262be330446..5c8f924abadc 100644 --- a/qa/suites/rbd/librbd/pool/small-cache-pool.yaml +++ b/qa/suites/rbd/librbd/pool/small-cache-pool.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - exec: client.0: diff --git a/qa/suites/rbd/librbd/workloads/c_api_tests.yaml b/qa/suites/rbd/librbd/workloads/c_api_tests.yaml index 188ddc56c607..b70e8d52b80a 100644 --- a/qa/suites/rbd/librbd/workloads/c_api_tests.yaml +++ b/qa/suites/rbd/librbd/workloads/c_api_tests.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/librbd/workloads/c_api_tests_with_defaults.yaml b/qa/suites/rbd/librbd/workloads/c_api_tests_with_defaults.yaml index ee1de610a91c..c2af3573dc5d 100644 --- a/qa/suites/rbd/librbd/workloads/c_api_tests_with_defaults.yaml +++ b/qa/suites/rbd/librbd/workloads/c_api_tests_with_defaults.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/librbd/workloads/c_api_tests_with_journaling.yaml b/qa/suites/rbd/librbd/workloads/c_api_tests_with_journaling.yaml index eda2b5e8a607..f1121a403965 100644 --- a/qa/suites/rbd/librbd/workloads/c_api_tests_with_journaling.yaml +++ b/qa/suites/rbd/librbd/workloads/c_api_tests_with_journaling.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/nbd/thrashosds-health.yaml b/qa/suites/rbd/nbd/thrashosds-health.yaml new file mode 120000 index 000000000000..ebf7f34f39bc --- /dev/null +++ b/qa/suites/rbd/nbd/thrashosds-health.yaml @@ -0,0 +1 @@ +../../../tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/rbd/qemu/pool/ec-cache-pool.yaml b/qa/suites/rbd/qemu/pool/ec-cache-pool.yaml index 80379a1026b7..09e8bc3f24b6 100644 --- a/qa/suites/rbd/qemu/pool/ec-cache-pool.yaml +++ b/qa/suites/rbd/qemu/pool/ec-cache-pool.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - exec: client.0: diff --git a/qa/suites/rbd/qemu/pool/small-cache-pool.yaml b/qa/suites/rbd/qemu/pool/small-cache-pool.yaml index 8262be330446..5c8f924abadc 100644 --- a/qa/suites/rbd/qemu/pool/small-cache-pool.yaml +++ b/qa/suites/rbd/qemu/pool/small-cache-pool.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - exec: client.0: diff --git a/qa/suites/rbd/singleton/all/rbd_mirror.yaml b/qa/suites/rbd/singleton/all/rbd_mirror.yaml index 21624164beba..5006dd8017b3 100644 --- a/qa/suites/rbd/singleton/all/rbd_mirror.yaml +++ b/qa/suites/rbd/singleton/all/rbd_mirror.yaml @@ -4,6 +4,9 @@ tasks: - install: - ceph: fs: xfs + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) - workunit: clients: all: [rbd/test_rbd_mirror.sh] diff --git a/qa/suites/rbd/thrash/thrashosds-health.yaml b/qa/suites/rbd/thrash/thrashosds-health.yaml new file mode 120000 index 000000000000..ebf7f34f39bc --- /dev/null +++ b/qa/suites/rbd/thrash/thrashosds-health.yaml @@ -0,0 +1 @@ +../../../tasks/thrashosds-health.yaml \ No newline at end of file diff --git a/qa/suites/rbd/thrash/workloads/rbd_api_tests.yaml b/qa/suites/rbd/thrash/workloads/rbd_api_tests.yaml index ee1de610a91c..c2af3573dc5d 100644 --- a/qa/suites/rbd/thrash/workloads/rbd_api_tests.yaml +++ b/qa/suites/rbd/thrash/workloads/rbd_api_tests.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml b/qa/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml index cfa0a25a70d0..7f64ef3f1361 100644 --- a/qa/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml +++ b/qa/suites/rbd/thrash/workloads/rbd_api_tests_copy_on_read.yaml @@ -7,6 +7,9 @@ tasks: RBD_FEATURES: "61" overrides: ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) conf: client: rbd clone copy on read: true diff --git a/qa/suites/rbd/thrash/workloads/rbd_api_tests_journaling.yaml b/qa/suites/rbd/thrash/workloads/rbd_api_tests_journaling.yaml index eda2b5e8a607..f1121a403965 100644 --- a/qa/suites/rbd/thrash/workloads/rbd_api_tests_journaling.yaml +++ b/qa/suites/rbd/thrash/workloads/rbd_api_tests_journaling.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/thrash/workloads/rbd_api_tests_no_locking.yaml b/qa/suites/rbd/thrash/workloads/rbd_api_tests_no_locking.yaml index 188ddc56c607..b70e8d52b80a 100644 --- a/qa/suites/rbd/thrash/workloads/rbd_api_tests_no_locking.yaml +++ b/qa/suites/rbd/thrash/workloads/rbd_api_tests_no_locking.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/valgrind/workloads/c_api_tests.yaml b/qa/suites/rbd/valgrind/workloads/c_api_tests.yaml index 188ddc56c607..b70e8d52b80a 100644 --- a/qa/suites/rbd/valgrind/workloads/c_api_tests.yaml +++ b/qa/suites/rbd/valgrind/workloads/c_api_tests.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/valgrind/workloads/c_api_tests_with_defaults.yaml b/qa/suites/rbd/valgrind/workloads/c_api_tests_with_defaults.yaml index ee1de610a91c..c2af3573dc5d 100644 --- a/qa/suites/rbd/valgrind/workloads/c_api_tests_with_defaults.yaml +++ b/qa/suites/rbd/valgrind/workloads/c_api_tests_with_defaults.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/valgrind/workloads/c_api_tests_with_journaling.yaml b/qa/suites/rbd/valgrind/workloads/c_api_tests_with_journaling.yaml index eda2b5e8a607..f1121a403965 100644 --- a/qa/suites/rbd/valgrind/workloads/c_api_tests_with_journaling.yaml +++ b/qa/suites/rbd/valgrind/workloads/c_api_tests_with_journaling.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: diff --git a/qa/suites/rbd/valgrind/workloads/rbd_mirror.yaml b/qa/suites/rbd/valgrind/workloads/rbd_mirror.yaml index 4a2ee40e394c..8adc7209ad7d 100644 --- a/qa/suites/rbd/valgrind/workloads/rbd_mirror.yaml +++ b/qa/suites/rbd/valgrind/workloads/rbd_mirror.yaml @@ -1,3 +1,8 @@ +overrides: + ceph: + log-whitelist: + - overall HEALTH_ + - (CACHE_POOL_NO_HIT_SET) tasks: - workunit: clients: