From: Sage Weil <sage@redhat.com>
Date: Thu, 31 Aug 2017 21:22:00 +0000 (-0400)
Subject: osd/PrimaryLogPG: do_op: no need to block on missing/degraded snapdir
X-Git-Tag: v13.0.1~840^2~52
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bc16d7e3007488042e74e69894a39bb2cf31a5e1;p=ceph.git

osd/PrimaryLogPG: do_op: no need to block on missing/degraded snapdir

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

diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc
index 40a9843d1405..abd69aa922be 100644
--- a/src/osd/PrimaryLogPG.cc
+++ b/src/osd/PrimaryLogPG.cc
@@ -2059,20 +2059,6 @@ void PrimaryLogPG::do_op(OpRequestRef& op)
     return;
   }
 
-  // missing snapdir?
-  hobject_t snapdir = head.get_snapdir();
-
-  if (is_unreadable_object(snapdir)) {
-    wait_for_unreadable_object(snapdir, op);
-    return;
-  }
-
-  // degraded object?
-  if (write_ordered && is_degraded_or_backfilling_object(snapdir)) {
-    wait_for_degraded_object(snapdir, op);
-    return;
-  }
-
   // dup/resent?
   if (op->may_write() || op->may_cache()) {
     // warning: we will get back *a* request for this reqid, but not