From: Dan van der Ster <daniel.vanderster@cern.ch>
Date: Mon, 7 Jul 2014 13:51:51 +0000 (+0200)
Subject: decrement WBThrottle perfcounters in clear_object
X-Git-Tag: v0.84~136^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d84d7204a104c0a02638152d61e80f7b32efedd2;p=ceph.git

decrement WBThrottle perfcounters in clear_object

We observed that the WBThrottle perfcounters are leaking upwards
at a rate of around 50-100 ios_dirtied per day. The counters are
currently not decremented in clear_object, so that's the likely
explanation. Decrement them like elsewhere in WBThrottle.

Signed-off-by: Dan van der Ster <daniel.vanderster@cern.ch>
---

diff --git a/src/os/WBThrottle.cc b/src/os/WBThrottle.cc
index 0354ceb8ccef..7d0bcf6f45f2 100644
--- a/src/os/WBThrottle.cc
+++ b/src/os/WBThrottle.cc
@@ -242,7 +242,10 @@ void WBThrottle::clear_object(const ghobject_t &hoid)
     return;
 
   cur_ios -= i->second.first.ios;
+  logger->dec(l_wbthrottle_ios_dirtied, i->second.first.ios);
   cur_size -= i->second.first.size;
+  logger->dec(l_wbthrottle_bytes_dirtied, i->second.first.size);
+  logger->dec(l_wbthrottle_inodes_dirtied);
 
   pending_wbs.erase(i);
   remove_object(hoid);