From f7a90c17822026f149d3de98484a1c5508a05c6d Mon Sep 17 00:00:00 2001 From: Ker Liu Date: Sun, 6 Nov 2016 04:36:00 +0800 Subject: [PATCH] osd/OSDMap.cc: fix dup assignment for new_blacklist_entries Signed-off-by: Ker Liu kerliu818@gmail.com --- src/osd/OSDMap.cc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 565adfbbe59..cd39f8feaf8 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::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::const_iterator p = inc.old_blacklist.begin(); -- 2.47.3