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 b0c9fa18d77bbbbe4d1748843751a4ea318f086d..aefeef31ca77c11d478048c744c34c368f2e3ed4 100644 (file)
--- 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);
       }
     }
   }