msg/SimpleMessenger: drop local_conneciton priv link on shutdwon

This breaks ref cycles between the local_connection and session, and let's
us drop the explicit set_priv() calls in OSD::shutdown().

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 3962d3bc09211c8a521d1f639882c66943f6acda..19de925774909b31be8083668f6ae6b6355f75be 100644 (file)
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -86,6 +86,9 @@ int SimpleMessenger::shutdown()
   ldout(cct,10) << "shutdown " << get_myaddr() << dendl;
   mark_down_all();
   dispatch_queue.shutdown();
+
+  // break ref cycles on the loopback connection
+  local_connection->set_priv(NULL);
   return 0;
 }
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 1a5a395cc9d907c485042661506fa8e48502fdf1..6f59dbfb976de395196a70486c0362139ec31a9a 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1787,10 +1787,6 @@ int OSD::shutdown()
   service.shutdown();
   op_tracker.on_shutdown();
 
-  // zap the Sessions for any loopback Connections
-  client_messenger->get_loopback_connection()->set_priv(NULL);
-  cluster_messenger->get_loopback_connection()->set_priv(NULL);
-
   class_handler->shutdown();
   client_messenger->shutdown();
   cluster_messenger->shutdown();