Merge pull request ceph#1643 from ceph/wip-8062

mon/OSDMonitor: ignore boot message from before last up_from Reviewed-by: Greg Farnum <[email protected]>
dano · Apr 11, 2014 · 756e362 · 756e362
2 parents 28371a2 + 4c99e97
commit 756e362
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
@@ -1207,6 +1207,12 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m)
     goto ignore;
   }
 
+  if (osdmap.exists(from) &&
+      osdmap.get_info(from).up_from > m->boot_epoch) {
+    dout(7) << "prepare_boot msg from before last up_from, ignoring" << dendl;
+    goto ignore;
+  }
+
   // noup?
   if (!can_mark_up(from)) {
     dout(7) << "preprocess_boot ignoring boot from " << m->get_orig_source_inst() << dendl;