*** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@800 29311d96-e01e-0410-9327-a35deaab8ce9

diff --git a/ceph/common/Thread.h b/ceph/common/Thread.h
index 845b761e619250932b53e2844c1c0007d6f1eb0d..e3be6445d0716519c29120cee0627bb136d64ac2 100644 (file)
--- a/ceph/common/Thread.h
+++ b/ceph/common/Thread.h
@@ -49,8 +49,10 @@ class Thread {
        int status = pthread_join(thread_id, prval);
        if (status == 0) 
          thread_id = 0;
-       else
+       else {
          cout << "join status = " << status << endl;
+         assert(0);
+       }
        return status;
   }
 };

diff --git a/ceph/msg/NewMessenger.cc b/ceph/msg/NewMessenger.cc
index 9ac3fee333b628231d26b432ff1d5f296d0dcdcc..dee5882700afb532f389f0a3478e7a39e02b7ef4 100644 (file)
--- a/ceph/msg/NewMessenger.cc
+++ b/ceph/msg/NewMessenger.cc
@@ -1449,9 +1449,11 @@ int Rank::EntityMessenger::shutdown()
   rank.unregister_entity(this);
 
   // stop my dispatch thread
-  if (dispatch_thread.am_self()) 
+  if (dispatch_thread.am_self()) {
+       dout(0) << "shutdown i am dispatch, setting stop flag" << endl;
        stop = true;
-  else {
+  } else {
+       dout(0) << "shutdown i am not dispatch, setting stop flag and joining thread." << endl;
        lock.Lock();
        stop = true;
        cond.Signal();