From: xiexingguo <xie.xingguo@gmail.com>
Date: Thu, 26 Apr 2018 13:08:15 +0000 (+0800)
Subject: osd/OSDMap: check pending pg upmap changes too
X-Git-Tag: v12.2.6~107^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44cac0504684e9c4b2a171faaf619dbe714f1ed2;p=ceph.git

osd/OSDMap: check pending pg upmap changes too

Signed-off-by: xiexingguo <xie.xingguo@gmail.com>
(cherry picked from commit 465aba5088a2f5597da15a46980144e1f8ecd83e)
---

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 7744593b041d..7b8585df37b8 100644
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1618,6 +1618,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) {