From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Fri, 23 Jan 2015 00:53:49 +0000 (+0800)
Subject: ReplicatedPG: Add some mark_delay events.
X-Git-Tag: v0.93~175^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=67c46375a3e61f8a45661349aa87781f25165386;p=ceph.git

ReplicatedPG: Add some mark_delay events.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 904119e27027..521bb9dd3e88 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -422,6 +422,7 @@ void ReplicatedPG::wait_for_unreadable_object(
 void ReplicatedPG::wait_for_all_missing(OpRequestRef op)
 {
   waiting_for_all_missing.push_back(op);
+  op->mark_delayed("waiting for all missing");
 }
 
 bool ReplicatedPG::is_degraded_object(const hobject_t& soid)
@@ -1267,6 +1268,7 @@ void ReplicatedPG::do_request(
 	     << " flushes_in_progress pending "
 	     << "waiting for active on " << op << dendl;
     waiting_for_active.push_back(op);
+    op->mark_delayed("waiting for flushes");
     return;
   }
 
@@ -1278,6 +1280,7 @@ void ReplicatedPG::do_request(
       return;
     } else {
       waiting_for_active.push_back(op);
+      op->mark_delayed("waiting for active");
       return;
     }
   }
@@ -1291,6 +1294,7 @@ void ReplicatedPG::do_request(
     if (is_replay()) {
       dout(20) << " replay, waiting for active on " << op << dendl;
       waiting_for_active.push_back(op);
+      op->mark_delayed("waiting for replay end");
       return;
     }
     // verify client features