From: Sage Weil <sage@newdream.net>
Date: Thu, 4 Nov 2010 05:28:54 +0000 (-0700)
Subject: mon: update mdsmap.last_failure_osd_epoch when blacklisting
X-Git-Tag: v0.23~19^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6345fcdafa33ee245352356202aaec21c007172d;p=ceph.git

mon: update mdsmap.last_failure_osd_epoch when blacklisting

We need to note the osdmap epoch the taking-over mds needs in the mdsmap.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index ca47b8553567..213fe215183d 100644
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -816,7 +816,7 @@ void MDSMonitor::tick()
 	  // blacklist laggy mds
 	  utime_t until = now;
 	  until += g_conf.mds_blacklist_interval;
-	  mon->osdmon()->blacklist(info.addr, until);
+	  pending_mdsmap.last_failure_osd_epoch = mon->osdmon()->blacklist(info.addr, until);
 	  propose_osdmap = true;
 	}
 	pending_mdsmap.mds_info.erase(gid);
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ca57c96f475f..004dccee09ca 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -867,10 +867,11 @@ void OSDMonitor::send_incremental(epoch_t first, entity_inst_t& dest)
 
 
 
-void OSDMonitor::blacklist(entity_addr_t a, utime_t until)
+epoch_t OSDMonitor::blacklist(entity_addr_t a, utime_t until)
 {
   dout(10) << "blacklist " << a << " until " << until << dendl;
   pending_inc.new_blacklist[a] = until;
+  return pending_inc.epoch;
 }
 
 
diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 9be1ab30750c..e38e95adc6bf 100644
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -168,7 +168,7 @@ private:
     send_incremental(m, start);
   }
 
-  void blacklist(entity_addr_t a, utime_t until);
+  epoch_t blacklist(entity_addr_t a, utime_t until);
 
   void check_subs();
   void check_sub(Subscription *sub);