From 131d1bd570906a63fa33f5efd74b1a34fabb07f2 Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Thu, 13 Apr 2017 12:01:09 -0400
Subject: [PATCH] qa: add log whitelists for MDS health messages

Now that we send these to the cluster log, we must
whitelist them in the tests that exercise those
unhealthy states.

Fixes: http://tracker.ceph.com/issues/19551
Signed-off-by: John Spray <john.spray@redhat.com>
---
 qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml | 2 ++
 qa/suites/fs/recovery/tasks/auto-repair.yaml     | 1 +
 qa/suites/fs/recovery/tasks/client-limits.yaml   | 5 +++++
 qa/suites/fs/recovery/tasks/damage.yaml          | 1 +
 qa/suites/fs/recovery/tasks/data-scan.yaml       | 2 ++
 qa/suites/fs/recovery/tasks/forward-scrub.yaml   | 1 +
 qa/suites/fs/recovery/tasks/journal-repair.yaml  | 3 +++
 qa/suites/fs/verify/validater/valgrind.yaml      | 7 +++++++
 8 files changed, 22 insertions(+)

diff --git a/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml b/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
index f0c2891ae7f..3b2714689f0 100644
--- a/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
+++ b/qa/suites/fs/basic/tasks/cephfs_scrub_tests.yaml
@@ -2,6 +2,8 @@ overrides:
   ceph:
     log-whitelist:
       - Scrub error on inode
+      - Behind on trimming
+      - Metadata damage detected
     conf:
       mds:
         mds log max segments: 1
diff --git a/qa/suites/fs/recovery/tasks/auto-repair.yaml b/qa/suites/fs/recovery/tasks/auto-repair.yaml
index e331cdd65b4..629804ec752 100644
--- a/qa/suites/fs/recovery/tasks/auto-repair.yaml
+++ b/qa/suites/fs/recovery/tasks/auto-repair.yaml
@@ -3,6 +3,7 @@ overrides:
     log-whitelist:
       - force file system read-only
       - bad backtrace
+      - MDS in read-only mode
 
 
 tasks:
diff --git a/qa/suites/fs/recovery/tasks/client-limits.yaml b/qa/suites/fs/recovery/tasks/client-limits.yaml
index 288866c636f..4483dbb6f8f 100644
--- a/qa/suites/fs/recovery/tasks/client-limits.yaml
+++ b/qa/suites/fs/recovery/tasks/client-limits.yaml
@@ -4,6 +4,11 @@ overrides:
     log-whitelist:
       - responding to mclientcaps\(revoke\)
       - not advance its oldest_client_tid
+      - failing to advance its oldest client/flush tid
+      - Too many inodes in cache
+      - failing to respond to cache pressure
+      - slow requests are blocked
+      - failing to respond to capability release
 
 tasks:
   - cephfs_test_runner:
diff --git a/qa/suites/fs/recovery/tasks/damage.yaml b/qa/suites/fs/recovery/tasks/damage.yaml
index 4b84977712e..3f4aac9e5df 100644
--- a/qa/suites/fs/recovery/tasks/damage.yaml
+++ b/qa/suites/fs/recovery/tasks/damage.yaml
@@ -16,6 +16,7 @@ overrides:
       - corrupt sessionmap header
       - Corrupt dentry
       - Scrub error on inode
+      - Metadata damage detected
 
 tasks:
   - cephfs_test_runner:
diff --git a/qa/suites/fs/recovery/tasks/data-scan.yaml b/qa/suites/fs/recovery/tasks/data-scan.yaml
index dd0a85f68c2..9428624e094 100644
--- a/qa/suites/fs/recovery/tasks/data-scan.yaml
+++ b/qa/suites/fs/recovery/tasks/data-scan.yaml
@@ -8,6 +8,8 @@ overrides:
       - error reading sessionmap
       - unmatched fragstat
       - was unreadable, recreating it now
+      - Scrub error on inode
+      - Metadata damage detected
 
 tasks:
   - cephfs_test_runner:
diff --git a/qa/suites/fs/recovery/tasks/forward-scrub.yaml b/qa/suites/fs/recovery/tasks/forward-scrub.yaml
index dbbed4bf718..b92cf10529f 100644
--- a/qa/suites/fs/recovery/tasks/forward-scrub.yaml
+++ b/qa/suites/fs/recovery/tasks/forward-scrub.yaml
@@ -6,6 +6,7 @@ overrides:
       - bad backtrace on inode
       - inode table repaired for inode
       - Scrub error on inode
+      - Metadata damage detected
 
 tasks:
   - cephfs_test_runner:
diff --git a/qa/suites/fs/recovery/tasks/journal-repair.yaml b/qa/suites/fs/recovery/tasks/journal-repair.yaml
index c85f46cb824..324ff75dfe9 100644
--- a/qa/suites/fs/recovery/tasks/journal-repair.yaml
+++ b/qa/suites/fs/recovery/tasks/journal-repair.yaml
@@ -4,6 +4,9 @@ overrides:
     log-whitelist:
       - bad backtrace on dir ino
       - error reading table object
+      - Metadata damage detected
+      - slow requests are blocked
+      - Behind on trimming
 
 tasks:
   - cephfs_test_runner:
diff --git a/qa/suites/fs/verify/validater/valgrind.yaml b/qa/suites/fs/verify/validater/valgrind.yaml
index ba660c5f739..82a6574752f 100644
--- a/qa/suites/fs/verify/validater/valgrind.yaml
+++ b/qa/suites/fs/verify/validater/valgrind.yaml
@@ -1,3 +1,10 @@
+
+# Valgrind makes everything slow, so ignore slow requests
+overrides:
+  ceph:
+    log-whitelist:
+      - slow requests are blocked
+
 os_type: centos   # xenial valgrind buggy, see http://tracker.ceph.com/issues/18126
 overrides:
   install:
-- 
2.39.5