From: Jianpeng Ma <jianpeng.ma@intel.com>
Date: Thu, 20 Aug 2015 09:00:23 +0000 (+0800)
Subject: osdc/Objeter: When cancel op, decrease num_unacked/num_uncommitted.
X-Git-Tag: v0.94.6~86^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6ff7b02dc23b42a99c7136d1a55ead05c12e2b97;p=ceph.git

osdc/Objeter: When cancel op, decrease num_unacked/num_uncommitted.

Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 064e8585a04edb3d87b38db6bed03e965cfcb359)
---

diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc
index 5d2d62eaa2e..683eacc75d0 100644
--- a/src/osdc/Objecter.cc
+++ b/src/osdc/Objecter.cc
@@ -2195,7 +2195,10 @@ int Objecter::op_cancel(OSDSession *s, ceph_tid_t tid, int r)
   if (op->onack) {
     op->onack->complete(r);
     op->onack = NULL;
+    num_unacked.dec();
   }
+  if (op->oncommit || op->oncommit_sync)
+    num_uncommitted.dec();
   if (op->oncommit) {
     op->oncommit->complete(r);
     op->oncommit = NULL;