osd/OSDMap.cc: fix dup assignment for new_blacklist_entries

Signed-off-by: Ker Liu kerliu818@gmail.com

diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc
index 565adfbbe59fca8231baad14f090539dcdbf491d..cd39f8feaf8038bd7d4dbee83693ce8e61f17b6e 100644 (file)
--- a/src/osd/OSDMap.cc
+++ b/src/osd/OSDMap.cc
@@ -1437,10 +1437,8 @@ int OSDMap::apply_incremental(const Incremental &inc)
   }
 
   // blacklist
-  for (map<entity_addr_t,utime_t>::const_iterator p = inc.new_blacklist.begin();
-       p != inc.new_blacklist.end();
-       ++p) {
-    blacklist[p->first] = p->second;
+  if (!inc.new_blacklist.empty()) {
+    blacklist.insert(inc.new_blacklist.begin(),inc.new_blacklist.end());
     new_blacklist_entries = true;
   }
   for (vector<entity_addr_t>::const_iterator p = inc.old_blacklist.begin();