]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
Merge PR #24797 into master
authorPatrick Donnelly <pdonnell@redhat.com>
Sat, 22 Dec 2018 20:33:19 +0000 (12:33 -0800)
committerPatrick Donnelly <pdonnell@redhat.com>
Sat, 22 Dec 2018 20:33:19 +0000 (12:33 -0800)
commit7b08cd79fecaaa87586a9b5256997b4db6c0df6d
tree65dd01fbb2a4f6f58e66b20dc81916b8e239e2bd
parent7e8c6838af4fdc816f5bb4edfd57a1ad26d9d8e8
parentd3a444473abc98e5ce8121af24538a141a292777
Merge PR #24797 into master

* refs/pull/24797/head:
mds: handle state change race

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
src/mds/Locker.cc
src/mds/MDCache.cc
src/mds/MDSRank.cc
src/mds/MDSRank.h