From ba36caba5226a44c41fdd2b19074916b38af5fdf Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Tue, 1 Sep 2015 15:12:02 +0800 Subject: [PATCH] osdc/Objecter: In _cancel_linger_op, it should make num_unacked/num_committed decrease. Signed-off-by: Jianpeng Ma (cherry picked from commit 36b62710ddef0ffaee25837a92ca1ac9b353ff05) --- src/osdc/Objecter.cc | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 683eacc75d0b4..d318d18e7958d 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -2682,9 +2682,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); } -- 2.39.5