]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
Merge PR #29221 into master
authorSage Weil <sage@redhat.com>
Fri, 26 Jul 2019 01:14:46 +0000 (20:14 -0500)
committerSage Weil <sage@redhat.com>
Fri, 26 Jul 2019 01:14:46 +0000 (20:14 -0500)
* refs/pull/29221/head:
mon/OSDMonitor: do not clobber pending xinfo during boot
osd/OSDMap: add is_dead() helper
mon/OSDMonitor: 'osd down ... --definitely-dead'
osd: send MOSDMarkMeDead when we are marked down
mon/OSDMonitor: implement MOSDMarkMeDead handling
mon/OSDMonitor: set dead_epoch for immediate failure (ECONNREFUSED)
osd/OSDMap: add dead_epoch to xinfo

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/mon/MonCommands.h
src/mon/OSDMonitor.cc
src/mon/OSDMonitor.h
src/msg/Message.cc
src/msg/Message.h
src/osd/OSD.cc
src/osd/OSDMap.cc
src/osd/OSDMap.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/osd/OSD.cc
Simple merge
Simple merge
Simple merge