From 6ff7b02dc23b42a99c7136d1a55ead05c12e2b97 Mon Sep 17 00:00:00 2001 From: Jianpeng Ma Date: Thu, 20 Aug 2015 17:00:23 +0800 Subject: [PATCH] osdc/Objeter: When cancel op, decrease num_unacked/num_uncommitted. Signed-off-by: Jianpeng Ma (cherry picked from commit 064e8585a04edb3d87b38db6bed03e965cfcb359) --- src/osdc/Objecter.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 5d2d62eaa2ed8..683eacc75d0b4 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; -- 2.39.5