From: xie xingguo <xie.xingguo@zte.com.cn>
Date: Wed, 1 Jun 2016 06:28:17 +0000 (+0800)
Subject: mon/MDSMonitor: fix wrongly set expiration time of blacklist
X-Git-Tag: v10.2.3~96^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c3f6d82d86f9720a373ec9792b927292f01897c0;p=ceph.git

mon/MDSMonitor: fix wrongly set expiration time of blacklist

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 0c3a92bb999e90212a9f38f9f4dc3bf89bd20acb)
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index b85df62f8cc08..6ece2701a25fe 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -616,7 +616,8 @@ bool MDSMonitor::prepare_beacon(MonOpRequestRef op)
       dout(4) << __func__ << ": marking rank "
               << info.rank << " damaged" << dendl;
 
-      const utime_t until = ceph_clock_now(g_ceph_context);
+      utime_t until = ceph_clock_now(g_ceph_context);
+      until += g_conf->mds_blacklist_interval;
       const auto blacklist_epoch = mon->osdmon()->blacklist(info.addr, until);
       request_proposal(mon->osdmon());
       pending_fsmap.damaged(gid, blacklist_epoch);