From: Zhi Zhang <willzzhang@tencent.com>
Date: Thu, 25 May 2017 08:34:46 +0000 (+0800)
Subject: mds/MDBalancer: put heartbeat msg ref after using mantle balancer
X-Git-Tag: v12.1.0~324^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bd8c06de9a4f67f4ef41b573771d24292196e592;p=ceph-ci.git

mds/MDBalancer: put heartbeat msg ref after using mantle balancer

Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
---

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index 17a055154aa..fe941abf143 100644
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -393,7 +393,7 @@ void MDBalancer::handle_heartbeat(MHeartbeat *m)
       /* avoid spamming ceph -w if user does not turn mantle on */
       if (mds->mdsmap->get_balancer() != "") {
         int r = mantle_prep_rebalance();
-        if (!r) return;
+        if (!r) goto out;
 	mds->clog->warn() << "using old balancer; mantle failed for "
                           << "balancer=" << mds->mdsmap->get_balancer()
                           << " : " << cpp_strerror(r);