From 9a1a01f8814df175d2d2c7a81f701d161cb4bab8 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 27 Oct 2021 21:06:37 +0000 Subject: [PATCH] mon: osdmon: don't overwrite type for entity_addr_t which is a cidr range Doing so makes it no longer a cidr range entity_addr_t. Signed-off-by: Greg Farnum --- src/mon/OSDMonitor.cc | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index bcfdb4ebcf9..b68810fce73 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -12695,11 +12695,13 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } else { - if (osdmap.require_osd_release >= ceph_release_t::nautilus) { - // always blocklist type ANY - addr.set_type(entity_addr_t::TYPE_ANY); - } else { - addr.set_type(entity_addr_t::TYPE_LEGACY); + if (!addr.is_cidr()) { + if (osdmap.require_osd_release >= ceph_release_t::nautilus) { + // always blocklist type ANY + addr.set_type(entity_addr_t::TYPE_ANY); + } else { + addr.set_type(entity_addr_t::TYPE_LEGACY); + } } string blocklistop; -- 2.39.5