]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: s/applying repop/canceling repop/
authorSage Weil <sage@inktank.com>
Tue, 8 Jul 2014 23:11:44 +0000 (16:11 -0700)
committerSage Weil <sage@redhat.com>
Wed, 23 Jul 2014 22:04:33 +0000 (15:04 -0700)
The 'applying' language dates back to when we would wait for acks from
replicas before applying writes locally.  We don't do any of that any more;
now, this loop just cancels the repops with remove_repop() and some other
cleanup.

Signed-off-by: Sage Weil <sage@inktank.com>
(cherry picked from commit ef40737eee4389faa7792661a0f9d15b3d0440f2)

src/osd/ReplicatedPG.cc

index 5a8d9bac9246c0ab926953af9a14b7f1db1ee64e..15d2edfd40909042d9722475e672500d87b9279a 100644 (file)
@@ -9220,7 +9220,7 @@ void ReplicatedPG::apply_and_flush_repops(bool requeue)
   while (!repop_queue.empty()) {
     RepGather *repop = repop_queue.front();
     repop_queue.pop_front();
-    dout(10) << " applying repop tid " << repop->rep_tid << dendl;
+    dout(10) << " canceling repop tid " << repop->rep_tid << dendl;
     repop->rep_aborted = true;
     if (repop->on_applied) {
       delete repop->on_applied;