]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/DaemonServer: prevent merge if either pg is remapped|upmap
authorSage Weil <sage@redhat.com>
Mon, 24 Sep 2018 18:03:05 +0000 (13:03 -0500)
committerSage Weil <sage@redhat.com>
Sat, 20 Oct 2018 20:21:58 +0000 (15:21 -0500)
commit550dcd53bb6db4f6b9d3b941f101332ac17a0168
treeabe650a34ab470d05f0c1fbb6ef26183346fe510
parent5bb9820b2d2b054dcd2309b63296d33c2538b54f
mgr/DaemonServer: prevent merge if either pg is remapped|upmap

Remapping means they could be on different OSDs.

Fixes: http://tracker.ceph.com/issues/36166
Signed-off-by: Sage Weil <sage@redhat.com>
src/mgr/DaemonServer.cc
src/osd/OSDMap.h