]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
scrub_test: Shards are not marked in error when osd guesses
authorDavid Zafman <dzafman@redhat.com>
Fri, 27 May 2016 23:56:17 +0000 (16:56 -0700)
committerDavid Zafman <dzafman@redhat.com>
Tue, 7 Jun 2016 19:22:28 +0000 (12:22 -0700)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 68400e95524181f6bdd1a250b72b1cb38f543aea)

tasks/scrub_test.py

index ed1383dc9973188a8f750bb01ca2a195fda0aa13..f68cafc8ec5fc874805fea6a9e2d2c2934f20900 100644 (file)
@@ -284,7 +284,6 @@ class InconsistentObjChecker:
     def data_digest_mismatch(self, inc):
         assert 'data_digest_mismatch' in inc['errors']
         self._check_attrs(inc, 'data_digest')
-        self._check_errors(inc, 'data_digest_mismatch')
 
     def missing(self, inc):
         assert 'missing' in inc['errors']
@@ -293,12 +292,10 @@ class InconsistentObjChecker:
     def size_mismatch(self, inc):
         assert 'size_mismatch' in inc['errors']
         self._check_attrs(inc, 'size')
-        self._check_errors(inc, 'size_mismatch')
 
     def omap_digest_mismatch(self, inc):
         assert 'omap_digest_mismatch' in inc['errors']
         self._check_attrs(inc, 'omap_digest')
-        self._check_errors(inc, 'omap_digest_mismatch')
 
 
 def test_list_inconsistent_obj(ctx, manager, osd_remote, pg, acting, osd_id,