From 0e4e5a5b26c1027cfb99edce869fecc4a5a2d487 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 22 Feb 2011 09:06:05 -0800 Subject: [PATCH] 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 --- src/osd/OSD.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index aa457f325d9b9..5b8555ab96658 100644 --- 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)); } } -- 2.39.5