]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
mgr/DaemonServer: remove any upmaps on merging PGs 24184/head
authorSage Weil <sage@redhat.com>
Mon, 24 Sep 2018 18:53:46 +0000 (13:53 -0500)
committerSage Weil <sage@redhat.com>
Sat, 20 Oct 2018 20:21:58 +0000 (15:21 -0500)
commitba3679c60b860358d1d471e6aa8a492fb5045132
tree645b07f2cdde76e6bb11d80f7c33216e8ab8dbd4
parent550dcd53bb6db4f6b9d3b941f101332ac17a0168
mgr/DaemonServer: remove any upmaps on merging PGs

Remove any pg_upmap[_items] on pgs that are merging to ensure that they
land on the same OSDs.

This is a bit sloppy: we *could* set the source upmap to match the target
upmap (vs potentially moving both PGs to a third location, and/or then
having the balancer move the resulting PG somewhere else again), but for
now assume upmaps are not a common case and Keep It Simple.

Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/DaemonServer.cc