]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/MDSMonitor: fix wrongly set expiration time of blacklist 9418/head
authorxie xingguo <xie.xingguo@zte.com.cn>
Wed, 1 Jun 2016 06:28:17 +0000 (14:28 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Wed, 1 Jun 2016 22:34:18 +0000 (06:34 +0800)
Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/mon/MDSMonitor.cc

index 7a7dfd3d102b9a6cfb205e874742cd7a67e6f851..53cdec0d08e786004413bc8984e248ff59442e03 100644 (file)
@@ -613,7 +613,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);