From: Patrick Donnelly <pdonnell@redhat.com>
Date: Mon, 9 Apr 2018 22:51:50 +0000 (-0700)
Subject: Merge PR #21267 into luminous
X-Git-Tag: v12.2.5~43
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2b54839a7bef2d3de8537c46658ff4b29161d204;p=ceph.git

Merge PR #21267 into luminous

* refs/pull/21267/head:
	discard the mdsload clear after prep_rebalance in case we want to export it for debugging
	make sure that MDBalancer uses heartbeat info from the same epoch

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
Reviewed-by: Zheng Yan <zyan@redhat.com>
---

2b54839a7bef2d3de8537c46658ff4b29161d204