OSDMonitor: implement remove_down_primary_temp()

Same as remove_down_pg_temp()

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

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index c8623cd206ec1812da9c33721d82c03e177be299..3a704c38d6e08f660f779f397252285a5fdd28b9 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -470,6 +470,20 @@ void OSDMonitor::remove_down_pg_temp()
   }
 }
 
+void OSDMonitor::remove_down_primary_temp()
+{
+  dout(10) << "remove_down_primary_temp" << dendl;
+  OSDMap tmpmap(osdmap);
+  tmpmap.apply_incremental(pending_inc);
+
+  for (map<pg_t,int>::iterator p = tmpmap.primary_temp->begin();
+      p != tmpmap.primary_temp->end();
+      ++p) {
+    if (tmpmap.is_down(p->second))
+      pending_inc.new_primary_temp[p->first] = -1;
+  }
+}
+
 /* Assign a lower weight to overloaded OSDs.
  *
  * The osds that will get a lower weight are those with with a utilization
@@ -560,8 +574,9 @@ void OSDMonitor::create_pending()
   // drop any redundant pg_temp entries
   remove_redundant_pg_temp();
 
-  // drop any pg_temp entries with no up entries
+  // drop any pg or primary_temp entries with no up entries
   remove_down_pg_temp();
+  remove_down_primary_temp();
 }
 
 /**

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 90ce6eb56335c957a9d796265ca1449e6d8887cb..ec49c609f716c8c609fe918e60909c47257fcb9a 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -206,6 +206,7 @@ private:
 
   void remove_redundant_pg_temp();
   void remove_down_pg_temp();
+  void remove_down_primary_temp();
   int reweight_by_utilization(int oload, std::string& out_str);
 
   bool check_source(PaxosServiceMessage *m, uuid_d fsid);