From: David Zafman <dzafman@redhat.com>
Date: Thu, 13 Jul 2017 16:44:29 +0000 (-0700)
Subject: osd: Change a check to an assert() since it can't happen anymore
X-Git-Tag: v12.2.0~26^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78cce1c5e183b64f11a4aef3c042898e6ed2cf5e;p=ceph.git

osd: Change a check to an assert() since it can't happen anymore

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

diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc
index d73bcd30c1a2..a8f2aa66479e 100644
--- a/src/osd/PGBackend.cc
+++ b/src/osd/PGBackend.cc
@@ -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)) {