]> git.apps.os.sepia.ceph.com Git - ceph.git/commit
OSDMonitor: only reject MOSDBoot based on up_from if inst matches 12003/head
authorSamuel Just <sjust@redhat.com>
Mon, 14 Nov 2016 19:50:23 +0000 (11:50 -0800)
committerSamuel Just <sjust@redhat.com>
Mon, 14 Nov 2016 19:50:23 +0000 (11:50 -0800)
commit033ad5b46c0492134e72a8372e44e3ef1358d2df
treefbd09f95d43bf1acf80bcfd673643666f03764c1
parent1d5002705f1ab5cd599194280fe40780c104074b
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>
src/mon/OSDMonitor.cc
src/osd/OSDMap.h