]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #21267 into luminous
authorPatrick Donnelly <pdonnell@redhat.com>
Mon, 9 Apr 2018 22:51:50 +0000 (15:51 -0700)
committerPatrick Donnelly <pdonnell@redhat.com>
Mon, 9 Apr 2018 22:51:50 +0000 (15:51 -0700)
* 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>
1  2 
src/mds/MDBalancer.cc

Simple merge