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 <gfarnum@redhat.com>
(cherry picked from commit 9a1a01f8814df175d2d2c7a81f701d161cb4bab8)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 73d3633d9920b5c302aae08c926bcd75d28b4921..ea13cfbba93b1312551c6aedd253d93f6d5b047c 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -12692,11 +12692,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;