From fe202dc20e40012a580135c4e3c276db09b5b785 Mon Sep 17 00:00:00 2001
From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Sat, 2 Jul 2005 16:52:56 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@379 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/client/SyntheticClient.cc | 2 +-
 ceph/config.cc                 | 4 ++--
 ceph/mds/LogStream.cc          | 2 +-
 ceph/msg/TCPMessenger.cc       | 8 ++++----
 ceph/osdc/Filer.cc             | 8 +++-----
 ceph/tcpsyn.cc                 | 6 ++++++
 6 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ceph/client/SyntheticClient.cc b/ceph/client/SyntheticClient.cc
index 8fabe4d4958f1..d39510b446d92 100644
--- a/ceph/client/SyntheticClient.cc
+++ b/ceph/client/SyntheticClient.cc
@@ -32,7 +32,7 @@ int SyntheticClient::run()
   for (list<int>::iterator it = modes.begin();
 	   it != modes.end();
 	   it++) {
-	mode = *it;
+	int mode = *it;
 		 
 	switch (mode) {
 	case SYNCLIENT_MODE_RANDOMWALK:
diff --git a/ceph/config.cc b/ceph/config.cc
index c6dc828b6aa32..af970e911df1c 100644
--- a/ceph/config.cc
+++ b/ceph/config.cc
@@ -26,9 +26,9 @@ OSDFileLayout g_OSD_FileLayout( 1<<20, 1, 1<<20 );   // stripe files over whole
 OSDFileLayout g_OSD_MDDirLayout( 1<<14, 1<<2, 1<<19 );
 
 // stripe mds log over 128 byte bits (see mds_log_pad_entry below to match!)
-OSDFileLayout g_OSD_MDLogLayout( 1<<7, 32, 1<<20 );
+//OSDFileLayout g_OSD_MDLogLayout( 1<<7, 32, 1<<20 );
 //OSDFileLayout g_OSD_MDLogLayout( 127, 32, 1<<20 );  // pathological case to test striping buffer mapping
-//OSDFileLayout g_OSD_MDLogLayout( 1<<20, 1, 1<<20 );
+OSDFileLayout g_OSD_MDLogLayout( 1<<20, 1, 1<<20 );
 
 
 md_config_t g_conf = {
diff --git a/ceph/mds/LogStream.cc b/ceph/mds/LogStream.cc
index 26f6ad35fb7d9..a4541287a918f 100644
--- a/ceph/mds/LogStream.cc
+++ b/ceph/mds/LogStream.cc
@@ -41,7 +41,7 @@ public:
 
 off_t LogStream::append(LogEvent *e)
 {
-  // serialize FIXME  ********
+  // serialize
   bufferlist bl;
   e->encode(bl);
 
diff --git a/ceph/msg/TCPMessenger.cc b/ceph/msg/TCPMessenger.cc
index 892373d90fa3b..de8488f1eee7d 100644
--- a/ceph/msg/TCPMessenger.cc
+++ b/ceph/msg/TCPMessenger.cc
@@ -156,10 +156,6 @@ int tcpmessenger_init(int& argc, char**& argv)
   //  for (int i=0; i<mpi_world; i++) 
   //dout(DBL) << "  addr of " << i << " is " << remote_addr[i] << endl;
 
-  dout(DBL) << "tcpmessenger_shutdown barrier" << endl;
-  MPI_Barrier (MPI_COMM_WORLD);
-  MPI_Finalize();
-
 
   // init socket arrays
   in_sd = new int[mpi_world];
@@ -177,6 +173,10 @@ int tcpmessenger_init(int& argc, char**& argv)
 
 int tcpmessenger_shutdown() 
 {
+  dout(DBL) << "tcpmessenger_shutdown barrier" << endl;
+  MPI_Barrier (MPI_COMM_WORLD);
+  MPI_Finalize();
+
   dout(2) << "tcpmessenger_shutdown closing all sockets etc" << endl;
 
   // bleh
diff --git a/ceph/osdc/Filer.cc b/ceph/osdc/Filer.cc
index 374984ee5ef1a..c620d3e56c237 100644
--- a/ceph/osdc/Filer.cc
+++ b/ceph/osdc/Filer.cc
@@ -83,13 +83,12 @@ Filer::read(inodeno_t ino,
   p->bytes_read = 0;
   p->onfinish = onfinish;
 
-  // find data
+  // map buffer into OSD extents
   osdcluster->file_to_extents(ino, layout, len, offset, p->extents);
 
   dout(7) << "osd read ino " << ino << " len " << len << " off " << offset << " in " << p->extents.size() << " object extents" << endl;
 
-
-  int nfrag = 0;
+  // issue reads
   off_t off = 0;
   for (list<OSDExtent>::iterator it = p->extents.begin();
 	   it != p->extents.end();
@@ -103,13 +102,12 @@ Filer::read(inodeno_t ino,
 						   OSD_OP_READ);
 	m->set_length(it->len);
 	m->set_offset(it->offset);
-	dout(15) << " read on " << last_tid << endl;
+	dout(15) << " read on " << last_tid << " from oid " << it->oid << " off " << it->offset << " len " << it->len << " (" << it->extents_in_buffer.size() << " buffer bits)" << endl;
 	messenger->send_message(m, MSG_ADDR_OSD(it->osd), 0);
 
 	// add to gather set
 	p->outstanding_ops.insert(last_tid);
 	op_reads[last_tid] = p;
-	nfrag++;
   }
 
   return 0;
diff --git a/ceph/tcpsyn.cc b/ceph/tcpsyn.cc
index 34798e3a4c659..1b2281eaea9b1 100644
--- a/ceph/tcpsyn.cc
+++ b/ceph/tcpsyn.cc
@@ -38,6 +38,8 @@ int main(int oargc, char **oargv) {
 
   int start = 0;
 
+
+
   // build new argc+argv for fuse
   typedef char* pchar;
   int nargc = 0;
@@ -90,6 +92,10 @@ int main(int oargc, char **oargv) {
   int myrank = tcpmessenger_init(argc, argv);
   int world = tcpmessenger_world();
 
+  //cerr << "horrible hack remove me" << endl;
+  //if (myrank == 0) g_conf.debug_filer = 15;
+
+
   if (myrank == 0)
 	cerr << "nummds " << NUMMDS << "  numosd " << NUMOSD << "  numclient " << NUMCLIENT << endl;
   assert(NUMMDS + NUMOSD + 1 <= world);
-- 
2.39.5