From: Sage Weil <sage@redhat.com>
Date: Wed, 4 Mar 2015 18:28:11 +0000 (-0800)
Subject: osdc/Objecter: count oncommit_sync as uncommitted
X-Git-Tag: v0.94~56^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7d35b935146355e01c6bb0d2ea41c32639da53a;p=ceph.git

osdc/Objecter: count oncommit_sync as uncommitted

Just be consistent.

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

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index b4792d65e8ca..cae3a5427404 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2027,7 +2027,7 @@ void Objecter::_send_op_account(Op *op)
   } else {
     ldout(cct, 20) << " note: not requesting ack" << dendl;
   }
-  if (op->oncommit) {
+  if (op->oncommit || op->oncommit_sync) {
     num_uncommitted.inc();
   } else {
     ldout(cct, 20) << " note: not requesting commit" << dendl;
@@ -2906,7 +2906,7 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
     ldout(cct, 5) << " got redirect reply; redirecting" << dendl;
     if (op->onack)
       num_unacked.dec();
-    if (op->oncommit)
+    if (op->oncommit || op->oncommit_sync)
       num_uncommitted.dec();
     _session_op_remove(s, op);
     s->lock.unlock();
@@ -3007,6 +3007,8 @@ void Objecter::handle_osd_op_reply(MOSDOpReply *m)
   if (op->oncommit_sync) {
     op->oncommit_sync->complete(rc);
     op->oncommit_sync = NULL;
+    num_uncommitted.dec();
+    logger->inc(l_osdc_op_commit);
   }
 
   /* get it before we call _finish_op() */