qa/suites/rbd: whitelist health messages

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/qa/suites/rbd/basic/cachepool/small.yaml b/qa/suites/rbd/basic/cachepool/small.yaml
index 8262be33044691b631cb8764b1015b0047c0ab4b..5c8f924abadcd3b3e165a99ee8ad00fcec00aea1 100644 (file)
--- 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 a98768540ba97f9274a370ab5a0d106e66d66081..9d34002a15882490a5b8e7a940b95a53a96c67da 100644 (file)
--- 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 263b784e27dd29c38cf45c6fc5ad2fae4fbb7214..f60a5ffa7e1b2b09e468998efb812967ef3c317e 100644 (file)
--- 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 75dfc6a45534e26818a5632eabcb1ae8ad494ea4..32dd2ab90792e50dbb8308682510fd9ab41fb414 100644 (file)
--- 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 8262be33044691b631cb8764b1015b0047c0ab4b..5c8f924abadcd3b3e165a99ee8ad00fcec00aea1 100644 (file)
--- 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 8262be33044691b631cb8764b1015b0047c0ab4b..5c8f924abadcd3b3e165a99ee8ad00fcec00aea1 100644 (file)
--- 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 188ddc56c6078ae51c4cb94ac960271201424af7..b70e8d52b80aff7a05e3fb6895b9605eb5348d0d 100644 (file)
--- 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 ee1de610a91c046d860883e9f2d372030f66d277..c2af3573dc5df4d94b745b255bdcd43b375cb50f 100644 (file)
--- 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 eda2b5e8a607ba58037671f98891d7d5cd10c3be..f1121a40396581d98afe55e557e8e0795c81ca74 100644 (file)
--- 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 (symlink)
index 0000000..ebf7f34
--- /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 80379a1026b7814064037dea1ea1655fa358e044..09e8bc3f24b6c8fd60865b597559bb37ac36464e 100644 (file)
--- 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 8262be33044691b631cb8764b1015b0047c0ab4b..5c8f924abadcd3b3e165a99ee8ad00fcec00aea1 100644 (file)
--- 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 21624164beba5fd444b08c9de97f167c8fe33575..5006dd8017b3928ad2f46a16c04db3386215c748 100644 (file)
--- 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 (symlink)
index 0000000..ebf7f34
--- /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 ee1de610a91c046d860883e9f2d372030f66d277..c2af3573dc5df4d94b745b255bdcd43b375cb50f 100644 (file)
--- 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 cfa0a25a70d0f98394b69f5141278ce2749519ce..7f64ef3f13618613a0af9b962403b1ad50a0c51b 100644 (file)
--- 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 eda2b5e8a607ba58037671f98891d7d5cd10c3be..f1121a40396581d98afe55e557e8e0795c81ca74 100644 (file)
--- 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 188ddc56c6078ae51c4cb94ac960271201424af7..b70e8d52b80aff7a05e3fb6895b9605eb5348d0d 100644 (file)
--- 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 188ddc56c6078ae51c4cb94ac960271201424af7..b70e8d52b80aff7a05e3fb6895b9605eb5348d0d 100644 (file)
--- 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 ee1de610a91c046d860883e9f2d372030f66d277..c2af3573dc5df4d94b745b255bdcd43b375cb50f 100644 (file)
--- 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 eda2b5e8a607ba58037671f98891d7d5cd10c3be..f1121a40396581d98afe55e557e8e0795c81ca74 100644 (file)
--- 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 4a2ee40e394caec47377e384c3ce47b97311362c..8adc7209ad7df8530ec44717994c21a2c2058758 100644 (file)
--- 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: