]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PrimaryLogPG: maybe_handle_manifest_detail - sanity check obc existence 17298/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Sat, 26 Aug 2017 08:54:40 +0000 (16:54 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 30 Aug 2017 06:20:51 +0000 (14:20 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PrimaryLogPG.cc

index d05ced7d46cfd0fbd37499f395f22e72518e90db..2e56f758ce4f2199536271f43a9d1fa1f654d2b3 100644 (file)
@@ -2344,19 +2344,15 @@ PrimaryLogPG::cache_result_t PrimaryLogPG::maybe_handle_manifest_detail(
   bool write_ordered,
   ObjectContextRef obc)
 {
+  assert(obc);
   if (static_cast<const MOSDOp *>(op->get_req())->get_flags() &
       CEPH_OSD_FLAG_IGNORE_REDIRECT) {
     dout(20) << __func__ << ": ignoring redirect due to flag" << dendl;
     return cache_result_t::NOOP;
   }
 
-  if (obc)
-    dout(10) << __func__ << " " << obc->obs.oi << " "
-       << (obc->obs.exists ? "exists" : "DNE")
-       << dendl;
-
   // if it is write-ordered and blocked, stop now
-  if (obc.get() && obc->is_blocked() && write_ordered) {
+  if (obc->is_blocked() && write_ordered) {
     // we're already doing something with this object
     dout(20) << __func__ << " blocked on " << obc->obs.oi.soid << dendl;
     return cache_result_t::NOOP;