From: David Zafman <dzafman@redhat.com>
Date: Mon, 6 Aug 2018 17:37:04 +0000 (-0700)
Subject: qa: Add new message to whitelist for scrub/repair tests
X-Git-Tag: v12.2.9~115^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74b5f80fbb424aee9d62c9ccb0fd27938d90bd30;p=ceph.git

qa: Add new message to whitelist for scrub/repair tests

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit b40784290f3b600941e0d97372fddee5c85ec20c)
---

diff --git a/qa/suites/rados/basic-luminous/scrub_test.yaml b/qa/suites/rados/basic-luminous/scrub_test.yaml
index 39821ad86727..15b98b56ce06 100644
--- a/qa/suites/rados/basic-luminous/scrub_test.yaml
+++ b/qa/suites/rados/basic-luminous/scrub_test.yaml
@@ -15,6 +15,7 @@ overrides:
     - 'attr name mistmatch'
     - 'deep-scrub 1 missing, 0 inconsistent objects'
     - 'failed to pick suitable auth object'
+    - 'candidate size [0-9]+ info size [0-9]+ mismatch'
     - overall HEALTH_
     - \(OSDMAP_FLAGS\)
     - \(OSD_
diff --git a/qa/suites/rados/basic/tasks/repair_test.yaml b/qa/suites/rados/basic/tasks/repair_test.yaml
index da765b018a45..f3a7868d1696 100644
--- a/qa/suites/rados/basic/tasks/repair_test.yaml
+++ b/qa/suites/rados/basic/tasks/repair_test.yaml
@@ -17,6 +17,7 @@ overrides:
       - 'size 1 != size'
       - attr name mismatch
       - Regular scrub request, deep-scrub details will be lost
+      - candidate size [0-9]+ info size [0-9]+ mismatch
       - overall HEALTH_
       - \(OSDMAP_FLAGS\)
       - \(OSD_
diff --git a/qa/tasks/repair_test.py b/qa/tasks/repair_test.py
index 5a63bd636aa7..8ad4d02be2dd 100644
--- a/qa/tasks/repair_test.py
+++ b/qa/tasks/repair_test.py
@@ -276,6 +276,7 @@ def task(ctx, config):
           - 'size 1 != size'
           - 'attr name mismatch'
           - 'Regular scrub request, deep-scrub details will be lost'
+          - 'candidate size [0-9]+ info size [0-9]+ mismatch'
         conf:
           osd:
             filestore debug inject read err: true
diff --git a/qa/tasks/scrub_test.py b/qa/tasks/scrub_test.py
index a545c9b89e2e..ef3a44ff0fdc 100644
--- a/qa/tasks/scrub_test.py
+++ b/qa/tasks/scrub_test.py
@@ -348,6 +348,7 @@ def task(ctx, config):
         - attr name mistmatch
         - deep-scrub 1 missing, 0 inconsistent objects
         - failed to pick suitable auth object
+        - candidate size [0-9]+ info size [0-9]+ mismatch
       conf:
         osd:
           osd deep scrub update digest min age: 0