From 465aba5088a2f5597da15a46980144e1f8ecd83e Mon Sep 17 00:00:00 2001 From: xiexingguo Date: Thu, 26 Apr 2018 21:08:15 +0800 Subject: [PATCH] osd/OSDMap: check pending pg upmap changes too Signed-off-by: xiexingguo --- src/osd/OSDMap.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 6ca4236b60358..ef520d25c094f 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1633,6 +1633,12 @@ void OSDMap::maybe_remove_pg_upmaps(CephContext *cct, for (auto& p : tmpmap.pg_upmap_items) { to_check.insert(p.first); } + for (auto& p : pending_inc->new_pg_upmap) { + to_check.insert(p.first); + } + for (auto& p : pending_inc->new_pg_upmap_items) { + to_check.insert(p.first); + } for (auto& pg : to_check) { auto crush_rule = tmpmap.get_pg_pool_crush_rule(pg); if (crush_rule < 0) { -- 2.39.5