]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commit
osd/OSDMap: handle incrementals that modify+del pool 5527/head
authorJohn Spray <john.spray@redhat.com>
Thu, 30 Jul 2015 13:20:56 +0000 (14:20 +0100)
committerNathan Cutler <ncutler@suse.com>
Mon, 10 Aug 2015 14:34:44 +0000 (16:34 +0200)
commit3396a969741f74e5b1f55d8d7af258493ca26478
treec602b5d039ac7d49d454c739a9e2d1f028d79464
parent88e7ee716fdd7bcf81845087021a677de5a50da8
osd/OSDMap: handle incrementals that modify+del pool

Because new_pools was processed after old_pools, if something
was modified and then deleted in the same incremental
map, then the resulting state would be a pool in the map
that had no entry in pool_name.

Fixes: #12429
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 8d4932e721e32a33c1bada54e11d4ecccd868618)
src/osd/OSDMap.cc