]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: Change a check to an assert() since it can't happen anymore
authorDavid Zafman <dzafman@redhat.com>
Thu, 13 Jul 2017 16:44:29 +0000 (09:44 -0700)
committerAbhishek Lekshmanan <abhishek@suse.com>
Wed, 23 Aug 2017 13:44:27 +0000 (15:44 +0200)
Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 8e2b9a07e0551895809a3fc036aae557fadc74ba)

src/osd/PGBackend.cc

index d73bcd30c1a21b646b4e9388d8bf5c936c4f73fc..a8f2aa66479ef021875e0d2b77ae5a50999bc153 100644 (file)
@@ -829,11 +829,8 @@ map<pg_shard_t, ScrubMap *>::const_iterator
       goto out;
     }
 
-    if (oi.soid != obj) {
-      shard_info.set_oi_attr_corrupted();
-      error_string += " oi_attr_corrupted";
-      goto out;
-    }
+    // This is automatically corrected in PG::_repair_oinfo_oid()
+    assert(oi.soid == obj);
 
     if (auth_version != eversion_t()) {
       if (!object_error.has_object_info_inconsistency() && !(bl == auth_bl)) {