]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mds/MDBalancer: put heartbeat msg ref after using mantle balancer
authorZhi Zhang <willzzhang@tencent.com>
Thu, 25 May 2017 08:34:46 +0000 (16:34 +0800)
committerZhi Zhang <willzzhang@tencent.com>
Fri, 26 May 2017 06:58:27 +0000 (14:58 +0800)
Signed-off-by: Zhi Zhang <zhangz.david@outlook.com>
src/mds/MDBalancer.cc

index 17a055154aa2a65bf6ba378411ff2cab9cd95062..fe941abf1439dca5b1e10ac295e570f3f8dc4337 100644 (file)
@@ -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);