From bf6c075b7e44d63ca9219e027421a547cb274bb3 Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Mon, 10 Jul 2017 12:40:01 -0400
Subject: [PATCH] qa/suites/fs: whitelist health warnings

Signed-off-by: Sage Weil <sage@redhat.com>
---
 qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml   | 5 +++++
 .../fs/basic_functional/overrides/whitelist_health.yaml  | 9 +++++++++
 .../fs/basic_functional/tasks/cephfs_scrub_tests.yaml    | 2 ++
 qa/suites/fs/thrash/overrides/whitelist_health.yaml      | 8 ++++++++
 4 files changed, 24 insertions(+)
 create mode 100644 qa/suites/fs/basic_functional/overrides/whitelist_health.yaml
 create mode 100644 qa/suites/fs/thrash/overrides/whitelist_health.yaml

diff --git a/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml b/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
index 4f2d6df1886..155ca724529 100644
--- a/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
+++ b/qa/cephfs/overrides/whitelist_wrongly_marked_down.yaml
@@ -1,7 +1,12 @@
 overrides:
   ceph:
     log-whitelist:
+      - overall HEALTH_
+      - (OSD_DOWN)
+      - (OSD_
       - wrongly marked me down
+# MDS daemon 'b' is not responding, replacing it as rank 0 with standby 'a'
+      - is not responding
     conf:
       mds:
         debug mds: 20
diff --git a/qa/suites/fs/basic_functional/overrides/whitelist_health.yaml b/qa/suites/fs/basic_functional/overrides/whitelist_health.yaml
new file mode 100644
index 00000000000..b5bf1fa7b5e
--- /dev/null
+++ b/qa/suites/fs/basic_functional/overrides/whitelist_health.yaml
@@ -0,0 +1,9 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (FS_DEGRADED)
+      - (MDS_FAILED)
+      - (MDS_DEGRADED)
+      - (FS_WITH_FAILED_MDS)
+      - (MDS_DAMAGE)
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 3b2714689f0..30b3a96e207 100644
--- a/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml
+++ b/qa/suites/fs/basic_functional/tasks/cephfs_scrub_tests.yaml
@@ -4,6 +4,8 @@ overrides:
       - Scrub error on inode
       - Behind on trimming
       - Metadata damage detected
+      - overall HEALTH_
+      - (MDS_TRIM)
     conf:
       mds:
         mds log max segments: 1
diff --git a/qa/suites/fs/thrash/overrides/whitelist_health.yaml b/qa/suites/fs/thrash/overrides/whitelist_health.yaml
new file mode 100644
index 00000000000..fc8119daca8
--- /dev/null
+++ b/qa/suites/fs/thrash/overrides/whitelist_health.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ceph:
+    log-whitelist:
+      - overall HEALTH_
+      - (FS_DEGRADED)
+      - (MDS_FAILED)
+      - (MDS_DEGRADED)
+      - (FS_WITH_FAILED_MDS)
-- 
2.39.5