msgr: should be destroyed in the same thread it's created

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 513bf0e60554a25a59f325f3981c7e3dd5cec33b..6b124952a0cd40db518fbf6b34749d65a04f7db2 100644 (file)
--- a/src/client/Client.cc
+++ b/src/client/Client.cc
@@ -173,8 +173,6 @@ Client::~Client()
   if (osdmap) { delete osdmap; osdmap = 0; }
   if (mdsmap) { delete mdsmap; mdsmap = 0; }
 
-  if (messenger)
-    messenger->destroy();
 }
 
 

diff --git a/src/cmon.cc b/src/cmon.cc
index 68234740001f4ca070125c96f9aeb2a6397ab839..883207cdfe3eb4f9a9c777a152a178228da82f11 100644 (file)
--- a/src/cmon.cc
+++ b/src/cmon.cc
@@ -157,6 +157,7 @@ int main(int argc, const char **argv)
 
   store.umount();
   delete mon;
+  rank->destroy();
 
   // cd on exit, so that gmon.out (if any) goes into a separate directory for each node.
   char s[20];

diff --git a/src/cosd.cc b/src/cosd.cc
index 62112710796c37ce2de58634dd6dc4d71e89635a..aacd93d9ac1a8d71e50272aeaa39d3796551c5a8 100644 (file)
--- a/src/cosd.cc
+++ b/src/cosd.cc
@@ -178,9 +178,10 @@ int main(int argc, const char **argv)
 
   rank->wait();
   rank_hb->wait();
-
   // done
   delete osd;
+  rank->destroy();
+  rank_hb->destroy();
 
   // cd on exit, so that gmon.out (if any) goes into a separate directory for each node.
   char s[20];

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 5ac53ccd26a89b9e657a4ab19674e6d046483315..8913afba18f9ec961cb7d0837508d109392a6785 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -111,8 +111,6 @@ Monitor::~Monitor()
     delete *p;
   for (vector<Paxos*>::iterator p = paxos.begin(); p != paxos.end(); p++)
     delete *p;
-  if (messenger)
-    messenger->destroy();
 }
 
 void Monitor::init()

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 8236fb0e197751f6dba007e1a5e80f2740e7193d..047494abbfe63a210476809fd9e023a35f74c4ef 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -292,10 +292,6 @@ OSD::~OSD()
   delete osdmap;
   delete logger;
   delete store;
-  if (messenger)
-    messenger->destroy();
-  if (heartbeat_messenger)
-    heartbeat_messenger->destroy();
 }
 
 bool got_sigterm = false;