]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osdc/Objecter: In _cancel_linger_op, it should make num_unacked/num_committed decrease.
authorJianpeng Ma <jianpeng.ma@intel.com>
Tue, 1 Sep 2015 07:12:02 +0000 (15:12 +0800)
committerJianpeng Ma <jianpeng.ma@intel.com>
Tue, 1 Sep 2015 07:12:02 +0000 (15:12 +0800)
Signed-off-by: Jianpeng Ma <jianpeng.ma@intel.com>
src/osdc/Objecter.cc

index b6be13d3038f36e6ad60729efc770437474f16a9..ebcade71ba459788be2e6d770ea36f593ca8e2eb 100644 (file)
@@ -2771,9 +2771,15 @@ void Objecter::_cancel_linger_op(Op *op)
   ldout(cct, 15) << "cancel_op " << op->tid << dendl;
 
   assert(!op->should_resend);
-  delete op->onack;
-  delete op->oncommit;
-  delete op->oncommit_sync;
+  if (op->onack) {
+    delete op->onack;
+    num_unacked.dec();
+  }
+  if (op->oncommit || op->oncommit_sync) {
+    delete op->oncommit;
+    delete op->oncommit_sync;
+    num_uncommitted.dec();
+  }
 
   _finish_op(op);
 }