]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge PR #18941 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Dec 2017 06:35:52 +0000 (22:35 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Wed, 6 Dec 2017 06:35:52 +0000 (22:35 -0800)
* refs/pull/18941/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