]> git.apps.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)
committerLoic Dachary <ldachary@redhat.com>
Fri, 2 Oct 2015 13:38:42 +0000 (15:38 +0200)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
(cherry picked from commit 064e8585a04edb3d87b38db6bed03e965cfcb359)

src/osdc/Objecter.cc

index 5d2d62eaa2ed84a08e95d4bbdaf361f9b6eceb5e..683eacc75d0b439326cdd26571f69a5cba67cd58 100644 (file)
@@ -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;