osd: set correct epoch for up_thru osd->mon request

Put the epoch we need for up_thru in the request.  Putting the most recent
epoch causes incorrect osdmap churn.

Fixes: #824
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index aa457f325d9b941152234bb474c417b3a3bce2e8..5b8555ab96658cbe19ab9b48fa8e19ed5fa7a25a 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1901,7 +1901,7 @@ void OSD::send_alive()
   if (up_thru_wanted > up_thru) {
     up_thru_pending = up_thru_wanted;
     dout(10) << "send_alive want " << up_thru_wanted << dendl;
-    monc->send_mon_message(new MOSDAlive(osdmap->get_epoch()));
+    monc->send_mon_message(new MOSDAlive(up_thru_wanted));
   }
 }