From: Samuel Just Date: Sun, 29 Mar 2015 23:03:32 +0000 (-0700) Subject: (scrub|rados)_test: tolerate best guess digest errors as well X-Git-Tag: v10.2.6~165^2^2~514^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9175f88943d2ea8382e999b7b0bee0b0352f8aef;p=ceph.git (scrub|rados)_test: tolerate best guess digest errors as well Signed-off-by: Samuel Just --- diff --git a/suites/rados/basic/tasks/repair_test.yaml b/suites/rados/basic/tasks/repair_test.yaml index 07747660bc6..1fd037bed21 100644 --- 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 b9f41530ea0..2b87c3f0dff 100644 --- 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