From: Sage Weil <sage@inktank.com>
Date: Fri, 11 Apr 2014 21:32:21 +0000 (-0700)
Subject: mon/OSDMonitor: fix osd epoch in boot check
X-Git-Tag: v0.80-rc1~55^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=39b9d9d8c4eb8803c9521166ace745e71089372d;p=ceph.git

mon/OSDMonitor: fix osd epoch in boot check

This was introduced in 4c99e978a77a242e540cb8ccacb967d24322416c and was
incorrect; boot_epoch is the previous epoch the osd booted in, not the
latest map epoch that the OSD currently has.

Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index ae00fbc7ad679..784e875f5c85e 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1208,7 +1208,7 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m)
   }
 
   if (osdmap.exists(from) &&
-      osdmap.get_info(from).up_from > m->boot_epoch) {
+      osdmap.get_info(from).up_from > m->version) {
     dout(7) << "prepare_boot msg from before last up_from, ignoring" << dendl;
     goto ignore;
   }