]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mon/OSDMonitor: share latest map with osd on dup boot message
authorSage Weil <sage@inktank.com>
Fri, 2 May 2014 22:00:11 +0000 (15:00 -0700)
committerSage Weil <sage@inktank.com>
Fri, 2 May 2014 22:54:32 +0000 (15:54 -0700)
If we get a dup boot message, share the newer maps with the osd so that
they know they are living in the past.

Fixes: #8279
Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Joao Eduardo Luis <joao.luis@inktank.com>
(cherry picked from commit 2e6b24868da0b203c2d70ac91071166d95d1d851)

src/mon/OSDMonitor.cc

index 78799d00ca6cd188d1868ffeec4863ee3f573509..dd027b2c91756462e4050d70526e06d6eb48d128 100644 (file)
@@ -1210,6 +1210,7 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m)
   if (osdmap.exists(from) &&
       osdmap.get_info(from).up_from > m->version) {
     dout(7) << "prepare_boot msg from before last up_from, ignoring" << dendl;
+    send_latest(m, m->sb.current_epoch+1);
     goto ignore;
   }