From: Sage Weil <sage@redhat.com>
Date: Fri, 26 Jul 2019 01:14:46 +0000 (-0500)
Subject: Merge PR #29221 into master
X-Git-Tag: v15.1.0~2076
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d87d271d411f55ce9422631cd3057d9704b3b626;p=ceph.git

Merge PR #29221 into master

* 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>
---

d87d271d411f55ce9422631cd3057d9704b3b626