From: John Spray <john.spray@redhat.com>
Date: Tue, 3 Feb 2015 11:19:59 +0000 (+0000)
Subject: mds: fix leaked MDCache::logger
X-Git-Tag: v0.93~112^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=17a8330eaeab4d82ad067eefb1fbcfe70885e7fd;p=ceph.git

mds: fix leaked MDCache::logger

Fixes: #10720
Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index aa866972ef73..867e192e9900 100644
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -167,6 +167,7 @@ public:
 
 
 MDCache::MDCache(MDS *m) :
+  logger(0),
   num_strays(0),
   num_strays_purging(0),
   num_strays_delayed(0),
@@ -219,6 +220,11 @@ MDCache::MDCache(MDS *m) :
 MDCache::~MDCache() 
 {
   delete migrator;
+  if (logger) {
+    g_ceph_context->get_perfcounters_collection()->remove(logger);
+    delete logger;
+    logger = 0;
+  }
   //delete renamer;
 }