(scrub|rados)_test: tolerate best guess digest errors as well

Signed-off-by: Samuel Just <sjust@redhat.com>

diff --git a/suites/rados/basic/tasks/repair_test.yaml b/suites/rados/basic/tasks/repair_test.yaml
index 07747660bc6fb02d0e5d7c4c0f22114844593f0e..1fd037bed213a2e462319c319d4fbf2362fc6d3a 100644 (file)
--- a/suites/rados/basic/tasks/repair_test.yaml
+++ b/suites/rados/basic/tasks/repair_test.yaml
@@ -1,6 +1,6 @@
 overrides:
   ceph:
-    log-whitelist: ['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', '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']
+    log-whitelist: ['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']
     conf:
       osd:
         filestore debug inject read err : true

diff --git a/suites/rados/basic/tasks/scrub_test.yaml b/suites/rados/basic/tasks/scrub_test.yaml
index b9f41530ea01c3815b88507721ddbeec2eeef9f6..2b87c3f0dffa621588fbd07aaea1285ed751bdc4 100644 (file)
--- a/suites/rados/basic/tasks/scrub_test.yaml
+++ b/suites/rados/basic/tasks/scrub_test.yaml
@@ -1,7 +1,11 @@
 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