From: Sage Weil <sage@redhat.com>
Date: Mon, 25 Feb 2019 22:52:13 +0000 (-0600)
Subject: mon/OSDMonitor: remove old v1 addrs when converting blacklist to new TYPE_ANY form
X-Git-Tag: v14.1.1~110^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a1f0156c311233cd3dabf1841a6529759ef5debf;p=ceph-ci.git

mon/OSDMonitor: remove old v1 addrs when converting blacklist to new TYPE_ANY form

Fixes: http://tracker.ceph.com/issues/38477
Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index b0c9fa18d77..aefeef31ca7 100644
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -1395,6 +1395,7 @@ void OSDMonitor::encode_pending(MonitorDBStore::TransactionRef t)
 	auto a = i.first;
 	a.set_type(entity_addr_t::TYPE_ANY);
 	pending_inc.new_blacklist[a] = i.second;
+	pending_inc.old_blacklist.push_back(i.first);
       }
     }
   }