From: Sage Weil <sage@newdream.net>
Date: Mon, 19 Oct 2009 19:02:22 +0000 (-0700)
Subject: Revert "msgr: be a bit more verbose during shutdown"
X-Git-Tag: v0.17~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e555cd329d66431f097b5ca068f3d0be46b56eef;p=ceph.git

Revert "msgr: be a bit more verbose during shutdown"

This reverts commit 4fe2e6acb9d3613ca041774c1243940d1c8c9c9c.

Conflicts:

	src/msg/SimpleMessenger.cc
---

diff --git a/src/TODO b/src/TODO
index 051c7e432b0d..8a961823fed1 100644
--- a/src/TODO
+++ b/src/TODO
@@ -41,8 +41,7 @@ v0.17
 - mon: less push, more pull
 - mon: request routing
 - mon cluster expansion
-
-- revert 4fe2e6acb9d3613ca041774c1243940d1c8c9c9c
+- osd: fix pg parsing, restarts on larger clusters
 
 - kclient: msgs built with a page list
 - kclient: retry alloc on ENOMEM when reading from connection?
diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc
index 38d7cc758f9e..e463bb5d7e04 100644
--- a/src/msg/SimpleMessenger.cc
+++ b/src/msg/SimpleMessenger.cc
@@ -347,7 +347,7 @@ void SimpleMessenger::Endpoint::ready()
 
 int SimpleMessenger::Endpoint::shutdown()
 {
-  dout(0) << "shutdown " << get_myaddr() << dendl;
+  dout(10) << "shutdown " << get_myaddr() << dendl;
   
   // stop my dispatch thread
   if (dispatch_thread.am_self()) {
@@ -2250,7 +2250,7 @@ void SimpleMessenger::wait()
   
   // done!  clean up.
   if (did_bind) {
-    dout(0) << "wait: stopping accepter thread" << dendl;
+    dout(20) << "wait: stopping accepter thread" << dendl;
     accepter.stop();
     dout(20) << "wait: stopped accepter thread" << dendl;
   }
@@ -2258,7 +2258,7 @@ void SimpleMessenger::wait()
   // close+reap all pipes
   lock.Lock();
   {
-    dout(0) << "wait: closing pipes" << dendl;
+    dout(10) << "wait: closing pipes" << dendl;
     list<Pipe*> toclose;
     for (hash_map<entity_addr_t,Pipe*>::iterator i = rank_pipe.begin();
          i != rank_pipe.end();
@@ -2274,8 +2274,8 @@ void SimpleMessenger::wait()
     }
 
     reaper();
+    dout(10) << "wait: waiting for pipes " << pipes << " to close" << dendl;
     while (!pipes.empty()) {
-      dout(0) << "wait: waiting for pipes " << pipes << " to close" << dendl;
       wait_cond.Wait(lock);
       reaper();
     }
@@ -2283,7 +2283,7 @@ void SimpleMessenger::wait()
   lock.Unlock();
 
   dout(10) << "wait: done." << dendl;
-  dout(0) << "shutdown complete." << dendl;
+  dout(1) << "shutdown complete." << dendl;
   remove_pid_file();
   started = false;
   did_bind = false;