From 80c77bb518e10dbf03bdc4a285ed4f50b79b9814 Mon Sep 17 00:00:00 2001 From: Matan Breizman Date: Tue, 25 Jul 2023 07:27:33 +0000 Subject: [PATCH] ceph_mon: allocate Throttles on stack Signed-off-by: Matan Breizman (cherry picked from commit 3b5860d9d7e087a55becae584dc00abb28790582) --- src/ceph_mon.cc | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc index 7dfe77768f3..dc89140456b 100644 --- a/src/ceph_mon.cc +++ b/src/ceph_mon.cc @@ -818,20 +818,20 @@ int main(int argc, const char **argv) Messenger::Policy::stateless_server(0)); // throttle client traffic - Throttle *client_throttler = new Throttle(g_ceph_context, "mon_client_bytes", - g_conf()->mon_client_bytes); + Throttle client_throttler(g_ceph_context, "mon_client_bytes", + g_conf()->mon_client_bytes); msgr->set_policy_throttlers(entity_name_t::TYPE_CLIENT, - client_throttler, NULL); + &client_throttler, NULL); // throttle daemon traffic // NOTE: actual usage on the leader may multiply by the number of // monitors if they forward large update messages from daemons. - Throttle *daemon_throttler = new Throttle(g_ceph_context, "mon_daemon_bytes", - g_conf()->mon_daemon_bytes); - msgr->set_policy_throttlers(entity_name_t::TYPE_OSD, daemon_throttler, - NULL); - msgr->set_policy_throttlers(entity_name_t::TYPE_MDS, daemon_throttler, - NULL); + Throttle daemon_throttler(g_ceph_context, "mon_daemon_bytes", + g_conf()->mon_daemon_bytes); + msgr->set_policy_throttlers(entity_name_t::TYPE_OSD, &daemon_throttler, + NULL); + msgr->set_policy_throttlers(entity_name_t::TYPE_MDS, &daemon_throttler, + NULL); entity_addrvec_t bind_addrs = ipaddrs; entity_addrvec_t public_addrs = ipaddrs; @@ -922,8 +922,6 @@ int main(int argc, const char **argv) delete mon; delete msgr; delete mgr_msgr; - delete client_throttler; - delete daemon_throttler; // cd on exit, so that gmon.out (if any) goes into a separate directory for each node. char s[20]; -- 2.47.3