From 42cec6fb7db71e810c7290777f61f8d60f3f1b88 Mon Sep 17 00:00:00 2001
From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Wed, 15 Feb 2006 21:45:18 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@638 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/mds/MDS.cc          |  2 ++
 ceph/msg/TCPMessenger.cc | 14 +++++++-------
 ceph/osd/OSD.cc          | 10 +++++-----
 ceph/osdc/Filer.cc       |  6 +++---
 4 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ceph/mds/MDS.cc b/ceph/mds/MDS.cc
index 49b03a2d8b510..059ad31f438be 100644
--- a/ceph/mds/MDS.cc
+++ b/ceph/mds/MDS.cc
@@ -229,6 +229,7 @@ int MDS::init()
 int MDS::shutdown_start()
 {
   dout(1) << "shutdown_start" << endl;
+  cerr << "mds shutdown start" << endl;
   for (int i=0; i<mdcluster->get_num_mds(); i++) {
 	if (i == whoami) continue;
 	dout(1) << "sending MShutdownStart to mds" << i << endl;
@@ -277,6 +278,7 @@ void MDS::handle_shutdown_finish(Message *m)
   
   if (did_shut_down.size() == (unsigned)mdcluster->get_num_mds()) {
 	// MDS's all ready to shut down!
+	cerr << "mds shutdown final" << endl;
 
 	dout(1) << "sending shutdown to remaining MDSs, OSDs" << endl;
 	for (int i=1; i<g_conf.num_mds; i++) {
diff --git a/ceph/msg/TCPMessenger.cc b/ceph/msg/TCPMessenger.cc
index 5964b094e9957..342033f2b0ea8 100644
--- a/ceph/msg/TCPMessenger.cc
+++ b/ceph/msg/TCPMessenger.cc
@@ -259,7 +259,7 @@ public:
 		 it++) {
 	  bool ok = tcp_lookup(*it);
 	  assert(ok);
-	  dout(0) << "lookup done, splicing in " << *it << endl;
+//	  dout(0) << "lookup done, splicing in " << *it << endl;
 	}
 	outgoing_lock.Lock();
 	outgoing.splice(outgoing.begin(), waiting);
@@ -562,7 +562,7 @@ Message *tcp_recv(int sd)
 
 void tcp_open(int rank)
 {
-  dout(1) << "tcp_open to rank " << rank << " at " << rank_addr[rank] << endl;
+  dout(DBL) << "tcp_open to rank " << rank << " at " << rank_addr[rank] << endl;
 
   // create socket?
   int sd = socket(AF_INET,SOCK_STREAM,0);
@@ -603,7 +603,7 @@ bool tcp_lookup(Message *m)
 	if (waiting_for_lookup.count(addr)) {
 	  dout(DBL) << "already looking up " << MSG_ADDR_NICE(addr) << endl;
 	} else {
-	  dout(1L) << "lookup on " << MSG_ADDR_NICE(addr) << " for " << m << endl;
+	  dout(DBL) << "lookup on " << MSG_ADDR_NICE(addr) << " for " << m << endl;
 	  MNSLookup *r = new MNSLookup(addr);
 	  rankmessenger->send_message(r, MSG_ADDR_DIRECTORY);
 	}
@@ -651,9 +651,9 @@ int tcp_send(Message *m)
 #endif
 
   // HACK osd -> client only
-  if (m->get_source() >= MSG_ADDR_OSD(0) && m->get_source() < MSG_ADDR_CLIENT(0) &&
-  m->get_dest() >= MSG_ADDR_CLIENT(0))
-	dout(1) << "sending " << m << " " << *m << " to " << MSG_ADDR_NICE(m->get_dest()) 
+  //if (m->get_source() >= MSG_ADDR_OSD(0) && m->get_source() < MSG_ADDR_CLIENT(0) &&
+ // m->get_dest() >= MSG_ADDR_CLIENT(0))
+	dout(DBL) << "sending " << m << " " << *m << " to " << MSG_ADDR_NICE(m->get_dest()) 
 	  //<< " rank " << rank 
 			<< " sd " << sd << endl;
   
@@ -760,7 +760,7 @@ void *tcp_inthread(void *r)
 	if (!m) break;
 	who = m->get_source();
 
-	dout(1) << "inthread got " << m << " from sd " << sd << " who is " << who << endl;
+	//dout(1) << "inthread got " << m << " from sd " << sd << " who is " << who << endl;
 
 	// give to dispatch loop
 	size_t sz;
diff --git a/ceph/osd/OSD.cc b/ceph/osd/OSD.cc
index 7d1f58e2c651c..6ec27c09753bd 100644
--- a/ceph/osd/OSD.cc
+++ b/ceph/osd/OSD.cc
@@ -2317,18 +2317,18 @@ void OSD::issue_replica_op(PG *pg, OSDReplicaOp *repop, int osd)
 void OSD::get_repop(OSDReplicaOp *repop)
 {
   repop->lock.Lock();
-  dout(1) << "get_repop " << *repop << endl;
+  dout(15) << "get_repop " << *repop << endl;
 }
 
 void OSD::put_repop(OSDReplicaOp *repop)
 {
-  dout(1) << "put_repop " << *repop << endl;
+  dout(15) << "put_repop " << *repop << endl;
 
   // safe?
   if (repop->can_send_safe() &&
 	  repop->op->wants_safe()) {
-	dout(1) << "put_repop sending safe on " << *repop << endl;
 	MOSDOpReply *reply = new MOSDOpReply(repop->op, 0, osdmap, true);
+	dout(15) << "put_repop sending safe on " << *repop << " " << reply << endl;
 	messenger->send_message(reply, repop->op->get_asker());
 	repop->sent_safe = true;
   }
@@ -2336,15 +2336,15 @@ void OSD::put_repop(OSDReplicaOp *repop)
   // ack?
   else if (repop->can_send_ack() &&
 		   repop->op->wants_ack()) {
-	dout(1) << "put_repop sending ack on " << *repop << endl;
 	MOSDOpReply *reply = new MOSDOpReply(repop->op, 0, osdmap, false);
+	dout(15) << "put_repop sending ack on " << *repop << " " << reply << endl;
 	messenger->send_message(reply, repop->op->get_asker());
 	repop->sent_ack = true;
   }
 
   // done.
   if (repop->can_delete()) {
-	dout(1) << "put_repop deleting " << *repop << endl;
+	dout(15) << "put_repop deleting " << *repop << endl;
 	repop->lock.Unlock();  
 	delete repop->op;
 	delete repop;
diff --git a/ceph/osdc/Filer.cc b/ceph/osdc/Filer.cc
index c42d2369b5515..3fcdbf8cb9f32 100644
--- a/ceph/osdc/Filer.cc
+++ b/ceph/osdc/Filer.cc
@@ -411,7 +411,7 @@ Filer::handle_osd_modify_reply(MOSDOpReply *m)
 {
   // get pio
   tid_t tid = m->get_tid();
-  dout(7) << "handle_osd_modify_reply " << tid << " safe " << m->get_safe() << endl;//" from " << MSG_ADDR_NICE(m->get_source()) << endl;
+  dout(7) << "handle_osd_modify_reply " << tid << " safe " << m->get_safe() << endl;
   assert(op_modify.count(tid));
   PendingOSDOp_t *p = op_modify[ tid ];
 
@@ -421,7 +421,7 @@ Filer::handle_osd_modify_reply(MOSDOpReply *m)
   // ack or safe?
   if (m->get_safe()) {
 	// safe.
-	dout(15) << " handle_osd_modify_reply safe on " << tid << endl;
+	//dout(15) << " handle_osd_modify_reply safe on " << tid << endl;
 	op_modify.erase( tid );
 	p->waitfor_ack.erase(tid);
 	p->waitfor_safe.erase(tid);
@@ -433,7 +433,7 @@ Filer::handle_osd_modify_reply(MOSDOpReply *m)
 	}
   } else {
 	// ack.
-	dout(15) << " handle_osd_modify_reply ack on " << tid << endl;
+	//dout(15) << " handle_osd_modify_reply ack on " << tid << endl;
 	assert(p->waitfor_ack.count(tid));
 	p->waitfor_ack.erase(tid);
 
-- 
2.39.5