From b914135158ccbde1eafcf47d70d885d48c18ac5a Mon Sep 17 00:00:00 2001
From: Greg Farnum <gregf@hq.newdream.net>
Date: Thu, 7 Jan 2010 15:35:26 -0800
Subject: [PATCH] msgr: should be destroyed in the same thread it's created

---
 src/client/Client.cc | 2 --
 src/cmon.cc          | 1 +
 src/cosd.cc          | 3 ++-
 src/mon/Monitor.cc   | 2 --
 src/osd/OSD.cc       | 4 ----
 5 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/client/Client.cc b/src/client/Client.cc
index 513bf0e60554a..6b124952a0cd4 100644
--- 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 68234740001f4..883207cdfe3eb 100644
--- 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 62112710796c3..aacd93d9ac1a8 100644
--- 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 5ac53ccd26a89..8913afba18f9e 100644
--- 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 8236fb0e19775..047494abbfe63 100644
--- 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;
-- 
2.39.5