From: Sage Weil <sage@redhat.com>
Date: Tue, 28 Apr 2015 22:19:37 +0000 (-0700)
Subject: Revert "osd: For object op, first check object whether unfound."
X-Git-Tag: v9.0.1~59^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=999dcc890b1b42ac2fcff4dc5e1cafcd034042d6;p=ceph.git

Revert "osd: For object op, first check object whether unfound."

This reverts commit b16b080332616f12852c15cd27e022a83ed86319.

It is normal for objects to be unfound for brief periods of time
after peering--we do not want to EIO in that case.

Fixes: #11464
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 015eba0cb409..67693e55e222 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -1400,11 +1400,6 @@ void ReplicatedPG::do_op(OpRequestRef& op)
 		 CEPH_NOSNAP, m->get_pg().ps(),
 		 info.pgid.pool(), m->get_object_locator().nspace);
 
-  if (missing_loc.is_unfound(head)) {
-    dout(10) << "do_op " << head << " is unfound, can't do anything" << dendl;
-    osd->reply_op_error(op, -EIO);
-    return;
-  }
 
   if (write_ordered && scrubber.write_blocked_by_scrub(head)) {
     dout(20) << __func__ << ": waiting for scrub" << dendl;
@@ -1429,11 +1424,6 @@ void ReplicatedPG::do_op(OpRequestRef& op)
   hobject_t snapdir(m->get_oid(), m->get_object_locator().key,
 		    CEPH_SNAPDIR, m->get_pg().ps(), info.pgid.pool(),
 		    m->get_object_locator().nspace);
-  if (missing_loc.is_unfound(snapdir)) {
-    dout(10) << "do_op " << snapdir << " is unfound, can't do anything" << dendl;
-    osd->reply_op_error(op, -EIO);
-    return;
-  }
   if (is_unreadable_object(snapdir)) {
     wait_for_unreadable_object(snapdir, op);
     return;