repair_test, scrub_test: Fix whitelists for scrub changes

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

diff --git a/qa/suites/rados/basic/tasks/repair_test.yaml b/qa/suites/rados/basic/tasks/repair_test.yaml
index 277a5a24022a250aafcc39bb17254fedad1e1c4c..9487a67c4dad7b01817e98d5f87790000bbfea84 100644 (file)
--- a/qa/suites/rados/basic/tasks/repair_test.yaml
+++ b/qa/suites/rados/basic/tasks/repair_test.yaml
@@ -1,6 +1,20 @@
 overrides:
   ceph:
-    log-whitelist: ['candidate had a stat error', 'candidate had a read error', 'deep-scrub 0 missing, 1 inconsistent objects', 'deep-scrub 0 missing, 4 inconsistent objects', 'deep-scrub 1 errors', 'deep-scrub 4 errors', '!= known omap_digest', '!= known data_digest', 'repair 0 missing, 1 inconsistent objects', 'repair 0 missing, 4 inconsistent objects', 'repair 1 errors, 1 fixed', 'repair 4 errors, 4 fixed', 'scrub 0 missing, 1 inconsistent', 'scrub 1 errors', 'size 1 != known size', '!= best guess']
+    log-whitelist:
+      - candidate had a stat error
+      - candidate had a read error
+      - deep-scrub 0 missing, 1 inconsistent objects
+      - deep-scrub 0 missing, 4 inconsistent objects
+      - deep-scrub [0-9]+ errors
+      - '!= omap_digest'
+      - '!= data_digest'
+      - repair 0 missing, 1 inconsistent objects
+      - repair 0 missing, 4 inconsistent objects
+      - repair [0-9]+ errors, [0-9]+ fixed
+      - scrub 0 missing, 1 inconsistent objects
+      - scrub [0-9]+ errors
+      - 'size 1 != size'
+      - attr name mismatch
     conf:
       osd:
         filestore debug inject read err : true

diff --git a/qa/suites/rados/basic/tasks/scrub_test.yaml b/qa/suites/rados/basic/tasks/scrub_test.yaml
index e3b07b6f7fd1fc21d34de227a35b7de8bc4d5914..938e73e3418515eadbfcd7f81370b18eb9bad02a 100644 (file)
--- a/qa/suites/rados/basic/tasks/scrub_test.yaml
+++ b/qa/suites/rados/basic/tasks/scrub_test.yaml
@@ -1,18 +1,19 @@
 overrides:
   ceph:
     log-whitelist:
-    - '!= best guess digest'
-    - '!= best guess data_digest'
-    - '!= best guess omap_digest'
-    - '!= known digest'
-    - '!= known data_digest'
-    - '!= known omap_digest'
-    - deep-scrub 0 missing, 1 inconsistent objects
-    - deep-scrub 1 errors
-    - repair 0 missing, 1 inconsistent objects
-    - repair 1 errors, 1 fixed
-    - shard [0-9]+ missing
-    - deep-scrub 1 missing, 0 inconsistent objects
+    - '!= data_digest'
+    - '!= omap_digest'
+    - '!= size'
+    - 'deep-scrub 0 missing, 1 inconsistent objects'
+    - 'deep-scrub [0-9]+ errors'
+    - 'repair 0 missing, 1 inconsistent objects'
+    - 'repair [0-9]+ errors, [0-9]+ fixed'
+    - 'shard [0-9]+ missing'
+    - 'deep-scrub 1 missing, 1 inconsistent objects'
+    - 'does not match object info size'
+    - 'attr name mistmatch'
+    - 'deep-scrub 1 missing, 0 inconsistent objects'
+    - 'failed to pick suitable auth object'
 tasks:
 - install:
 - ceph:

diff --git a/qa/tasks/repair_test.py b/qa/tasks/repair_test.py
index a547c76fc5cccc31a8ede6e4688b398acd1e3414..3211b94dfd35b88eb7edf919f5d3a50327080e37 100644 (file)
--- a/qa/tasks/repair_test.py
+++ b/qa/tasks/repair_test.py
@@ -265,16 +265,16 @@ def task(ctx, config):
           - 'candidate had a read error'
           - 'deep-scrub 0 missing, 1 inconsistent objects'
           - 'deep-scrub 0 missing, 4 inconsistent objects'
-          - 'deep-scrub 1 errors'
-          - 'deep-scrub 4 errors'
-          - '!= known omap_digest'
+          - 'deep-scrub [0-9]+ errors'
+          - '!= omap_digest'
+          - '!= data_digest'
           - 'repair 0 missing, 1 inconsistent objects'
           - 'repair 0 missing, 4 inconsistent objects'
-          - 'repair 1 errors, 1 fixed'
-          - 'repair 4 errors, 4 fixed'
-          - 'scrub 0 missing, 1 inconsistent'
-          - 'scrub 1 errors'
-          - 'size 1 != known size'
+          - 'repair [0-9]+ errors, [0-9]+ fixed'
+          - 'scrub 0 missing, 1 inconsistent objects'
+          - 'scrub [0-9]+ errors'
+          - 'size 1 != size'
+          - 'attr name mismatch'
         conf:
           osd:
             filestore debug inject read err: true

diff --git a/qa/tasks/scrub_test.py b/qa/tasks/scrub_test.py
index facc624e5036df5843f3b37a26009ca340867e73..9988e21ad25089307ca9ba34c10a0ed51f723462 100644 (file)
--- a/qa/tasks/scrub_test.py
+++ b/qa/tasks/scrub_test.py
@@ -329,12 +329,19 @@ def task(ctx, config):
     - install:
     - ceph:
         log-whitelist:
-        - '!= known digest'
-        - '!= known omap_digest'
+        - '!= data_digest'
+        - '!= omap_digest'
+        - '!= size'
         - deep-scrub 0 missing, 1 inconsistent objects
-        - deep-scrub 1 errors
+        - deep-scrub [0-9]+ errors
         - repair 0 missing, 1 inconsistent objects
-        - repair 1 errors, 1 fixed
+        - repair [0-9]+ errors, [0-9]+ fixed
+        - shard [0-9]+ missing
+        - deep-scrub 1 missing, 1 inconsistent objects
+        - does not match object info size
+        - attr name mistmatch
+        - deep-scrub 1 missing, 0 inconsistent objects
+        - failed to pick suitable auth object
     - scrub_test:
     """
     if config is None: