From: Ker Liu <ker.liu@alcatel-lucent.com>
Date: Sat, 5 Nov 2016 20:36:00 +0000 (+0800)
Subject: osd/OSDMap.cc: fix dup assignment for new_blacklist_entries
X-Git-Tag: v11.1.0~306^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f7a90c17822026f149d3de98484a1c5508a05c6d;p=ceph.git

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 565adfbbe59f..cd39f8feaf80 100644
--- 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();