]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
Merge pull request #20653 from xiexingguo/wip-fix-upmap
authorKefu Chai <tchaikov@gmail.com>
Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)
committerGitHub <noreply@github.com>
Fri, 2 Mar 2018 01:01:06 +0000 (09:01 +0800)
commit1b5c9375091334493a244f534f38bf119c5b2303
tree473d9d79d7bbc30ddcb58d209bb0747c7bd80aaa
parent759e5f5a9bea88b2ca4b764e1ad5af2b86e8f8bd
parent5fa467e06bd0cb4f6cc6e1de4283d73693c10eda
Merge pull request #20653 from xiexingguo/wip-fix-upmap

mon, osd: fix potential collided *Up Set* after PG remapping

Reviewed-by: Sage Weil <sage@redhat.com>
src/mon/OSDMonitor.cc
src/osd/OSDMap.cc