From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Mon, 27 Jun 2005 03:10:42 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: v0.1~2037
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bb0b4dbb3bd17adf71d28c5ceed00b2d3a1c081d;p=ceph.git

*** empty log message ***


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

diff --git a/ceph/mds/MDS.cc b/ceph/mds/MDS.cc
index e39b5666d09..9c3b572c89e 100644
--- a/ceph/mds/MDS.cc
+++ b/ceph/mds/MDS.cc
@@ -225,15 +225,16 @@ void MDS::handle_shutdown_finish(Message *m)
   if (m) 
 	mds = m->get_source();
 						 
-  dout(2) << "handle_shutdown_finish from " << mds << endl;
+  dout(1) << "handle_shutdown_finish from " << mds << endl;
   did_shut_down.insert(mds);
-  dout(2) << " shut down so far: " << did_shut_down << endl;
+  dout(1) << " shut down so far: " << did_shut_down << endl;
   
   if (did_shut_down.size() == mdcluster->get_num_mds()) {
 	// MDS's all shut down!
 
 	// shut down osd's
 	for (int i=0; i<g_conf.num_osd; i++) {
+	  dout(1) << "sending shutdown to osd" << i << endl;
 	  messenger->send_message(new MGenericMessage(MSG_SHUTDOWN),
 							  MSG_ADDR_OSD(i), 0, 0);
 	}
diff --git a/ceph/msg/TCPMessenger.cc b/ceph/msg/TCPMessenger.cc
index 6d311ea4f54..c409e1afb74 100644
--- a/ceph/msg/TCPMessenger.cc
+++ b/ceph/msg/TCPMessenger.cc
@@ -445,7 +445,7 @@ int tcp_send(Message *m)
 void* tcp_sendthread(void*)
 {
   outgoing_lock.Lock();
-  while (outgoing.empty() && !tcp_done) {
+  while (!outgoing.empty() || !tcp_done) {
 	
 	while (outgoing.size()) {
 	  Message *m = outgoing.front();