OSDMonitor: remove primary_temp entries when you remove their pool

Signed-off-by: Greg Farnum <greg@inktank.com>

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 31e977c58c4b4b8cbbe3158fc2465ccea6ca58e5..77d33a04bbeeb2ae887820d7fffe6d982ae4338e 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -4651,6 +4651,15 @@ int OSDMonitor::_prepare_remove_pool(uint64_t pool)
       pending_inc.new_pg_temp[p->first].clear();
     }
   }
+  for (map<pg_t,int>::iterator p = osdmap.primary_temp->begin();
+      p != osdmap.primary_temp->end();
+      ++p) {
+    if (p->first.pool() == pool) {
+      dout(10) << "_prepare_remove_pool " << pool
+               << " removing obsolete primary_temp" << p->first << dendl;
+      pending_inc.new_primary_temp[p->first] = -1;
+    }
+  }
   return 0;
 }