]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
osd/OSD: further cleanup send_incremental_map()
authorMatan Breizman <mbreizma@redhat.com>
Thu, 16 Nov 2023 10:24:29 +0000 (10:24 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Mon, 18 Dec 2023 13:19:08 +0000 (13:19 +0000)
Signed-off-by: Matan Breizman <mbreizma@redhat.com>
src/osd/OSD.cc

index 136e51cccc81b8acb39d75085ca56020dc4e2b84..04e9b4b6d545190ee6d2ea1650a40755b87802f3 100644 (file)
@@ -1456,7 +1456,6 @@ void OSDService::send_incremental_map(epoch_t since, Connection *con,
   dout(10) << "send_incremental_map " << since << " -> " << to
            << " to " << con << " " << con->get_peer_addr() << dendl;
 
-  MOSDMap *m = NULL;
   OSDSuperblock sblock(get_superblock());
   if (to > since && (int64_t)(to - since) > cct->_conf->osd_map_share_max_epochs) {
     dout(10) << "  " << (to - since) << " > max "
@@ -1464,8 +1463,7 @@ void OSDService::send_incremental_map(epoch_t since, Connection *con,
              << ", only sending most recent" << dendl;
     since = to - cct->_conf->osd_map_share_max_epochs;
   }
-  m = build_incremental_map_msg(since, to, sblock);
-  send_map(m, con);
+  con->send_message(build_incremental_map_msg(since, to, sblock));
 }
 
 bool OSDService::_get_map_bl(epoch_t e, bufferlist& bl)