]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objeter: When cancel op, decrease num_unacked/num_uncommitted.
authorJianpeng Ma <jianpeng.ma@intel.com>
Thu, 20 Aug 2015 09:00:23 +0000 (17:00 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 1 Sep 2015 00:45:19 +0000 (08:45 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osdc/Objecter.cc

index 22c122372a4601b36e3c2ae9e53c52934c08079f..b6be13d3038f36e6ad60729efc770437474f16a9 100644 (file)
@@ -2241,7 +2241,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;