]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ReplicatedPG: Add some mark_delay events.
authorJianpeng Ma <jianpeng.ma@intel.com>
Fri, 23 Jan 2015 00:53:49 +0000 (08:53 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Fri, 23 Jan 2015 00:53:49 +0000 (08:53 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osd/ReplicatedPG.cc

index 904119e27027fd04df147e0f40db8c295218a488..521bb9dd3e88bc14aebcd5a1aac0929365167691 100644 (file)
@@ -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