]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MDSMonitor: fix wrongly set expiration time of blacklist 9561/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 1 Jun 2016 06:28:17 +0000 (14:28 +0800)
committerAbhishek Varshney <abhishek.varshney@flipkart.com>
Tue, 7 Jun 2016 14:43:07 +0000 (20:13 +0530)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
(cherry picked from commit 0c3a92bb999e90212a9f38f9f4dc3bf89bd20acb)

src/mon/MDSMonitor.cc

index b85df62f8cc08a55fda1b07fdcfaed0755dc8c9f..6ece2701a25fefff7e78d4a537b764f2ce527c29 100644 (file)
@@ -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);