]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
OSDMonitor: only reject MOSDBoot based on up_from if inst matches 12067/head
authorSamuel Just <sjust@redhat.com>
Mon, 14 Nov 2016 19:50:23 +0000 (11:50 -0800)
committersmithfarm <ncutler@suse.com>
Fri, 2 Dec 2016 19:22:17 +0000 (20:22 +0100)
commitd194db826bb26483f847235bf062ba7b225be147
tree77237b74bead6bf31b75e3bd93dddcf4c93e904e
parent6d17188786ef7bd574dd8336d1e97e069db9de74
OSDMonitor: only reject MOSDBoot based on up_from if inst matches

If the osd actually restarts, there is no guarrantee that the epoch will
advance past up_from.  If the inst is different, it can't really be a
dup.  At worst, it might be a queued MOSDBoot from a previous inst, but
in that case, the real inst would see itself marked up, and then back
down causing it to try booting again.

Fixes: http://tracker.ceph.com/issues/17899
Signed-off-by: Samuel Just <sjust@redhat.com>
(cherry picked from commit 033ad5b46c0492134e72a8372e44e3ef1358d2df)
src/mon/OSDMonitor.cc
src/osd/OSDMap.h