*** empty log message ***

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

diff --git a/ceph/common/Logger.cc b/ceph/common/Logger.cc
index 7f6741753c31b23339e8a311698ea82e28140cb1..a09c0f42c41409ad103234a962c70c21b2d7a8ea 100644 (file)
--- a/ceph/common/Logger.cc
+++ b/ceph/common/Logger.cc
@@ -13,7 +13,12 @@
 Logger::Logger(string& fn, LogType *type)
 {
   filename = "log/";
+  if (g_conf.log_name) {
+       filename += g_conf.log_name;
+       filename += "/";
+  }
   filename += fn;
+  cout << "log " << filename << endl;
   interval = g_conf.log_interval;
   start = g_clock.gettimepair();  // time 0!
   last_logged = 0;
@@ -96,8 +101,7 @@ void Logger::flush(bool force)
        }
 
        // write line to log
-       //out << (long)(last_logged - start);
-       out << fromstart;
+       out << last_logged;
        for (vector<string>::iterator it = type->keys.begin(); it != type->keys.end(); it++) {
          out << "\t" << get(*it);
        }

diff --git a/ceph/config.cc b/ceph/config.cc
index 0925e8570a9429f8380475271259893d04e2114e..dddc90931f03386003d6c4f8a13aa1c81ee3d092 100644 (file)
--- a/ceph/config.cc
+++ b/ceph/config.cc
@@ -19,6 +19,7 @@ md_config_t g_conf = {
   // profiling and debugging
   log_messages: true,
   log_interval: 10.0,
+  log_name: 0,
 
   fake_clock: false,
   fakemessenger_serialize: true,
@@ -112,6 +113,8 @@ void parse_config_options(int argc, char **argv,
 
        else if (strcmp(argv[i], "--debug") == 0) 
          g_conf.debug = atoi(argv[++i]);
+       else if (strcmp(argv[i], "--log") == 0) 
+         g_conf.log_name = argv[++i];
 
        else if (strcmp(argv[i], "--mds_cache_size") == 0) 
          g_conf.mds_cache_size = atoi(argv[++i]);

diff --git a/ceph/config.h b/ceph/config.h
index cbc5d0c41cdade4e3f6facaefb57af3ea4e58fac..81ffc80ff586b2da288adeee551a810a750a3a9a 100644 (file)
--- a/ceph/config.h
+++ b/ceph/config.h
@@ -10,13 +10,14 @@ struct md_config_t {
   // profiling
   bool log_messages;
   float log_interval;
+  char *log_name;
 
   bool fake_clock;
   bool fakemessenger_serialize;
 
   int  debug;
-
  
+
   // client
   int      client_cache_size;
   float    client_cache_mid;

diff --git a/ceph/mds/MDCache.cc b/ceph/mds/MDCache.cc
index cc0ccc31de792882925d38aac1441eb1bcfd044b..660316ada06e24be3cc1c1c4744d3c445f74cf7f 100644 (file)
--- a/ceph/mds/MDCache.cc
+++ b/ceph/mds/MDCache.cc
@@ -1372,6 +1372,8 @@ bool MDCache::request_start(Message *req,
   // request pins
   request_pin_inode(req, ref);
   
+  mds->logger->inc("req");
+
   return true;
 }
 
@@ -1471,6 +1473,8 @@ void MDCache::request_finish(Message *req)
   request_cleanup(req);
   delete req;  // delete req
   
+  mds->logger->inc("rep");
+
   //dump();
 }
 
@@ -1484,6 +1488,8 @@ void MDCache::request_forward(Message *req, int who, int port)
   mds->messenger->send_message(req,
                                                           MSG_ADDR_MDS(who), port,
                                                           port);
+
+  mds->logger->inc("fw");
 }
 
 

diff --git a/ceph/mds/MDLog.cc b/ceph/mds/MDLog.cc
index e2afd4390e540af4c8f0a5227af7034b39a4ea80..42ddf5e6a0ec15c1d79b97d07bef02289bfa4c75 100644 (file)
--- a/ceph/mds/MDLog.cc
+++ b/ceph/mds/MDLog.cc
@@ -30,12 +30,13 @@ MDLog::MDLog(MDS *m)
                                                 100 + mds->get_nodeid());
 
   string name;
-  name = "log.mds";
+  name = "mds";
   int w = mds->get_nodeid();
   if (w >= 1000) name += ('0' + ((w/1000)%10));
   if (w >= 100) name += ('0' + ((w/100)%10));
   if (w >= 10) name += ('0' + ((w/10)%10));
   name += ('0' + ((w/1)%10));
+  name += ".log";
   logger = new Logger(name, (LogType*)&mdlog_logtype);
 }
 
@@ -83,6 +84,7 @@ int MDLog::submit_entry_2( LogEvent *e,
   // written!
   num_events++;
   delete e;
+  logger->set("len", num_events);
 
   if (c) {
        c->finish(0);

diff --git a/ceph/mds/MDS.cc b/ceph/mds/MDS.cc
index 5c691b6b68454dcab0348ee00a59dc50d6969455..317020aa64a6944ca0b9fbab4d5d71a8ef091912 100644 (file)
--- a/ceph/mds/MDS.cc
+++ b/ceph/mds/MDS.cc
@@ -871,7 +871,6 @@ void MDS::handle_client_stat(MClientRequest *req,
 
   mdcache->inode_soft_read_finish(ref);
 
-  logger->inc("ostat");
   timepair_t now = g_clock.gettimepair();
   stat_read.hit(now);
   stat_req.hit(now);
@@ -1067,7 +1066,6 @@ void MDS::handle_client_readdir(MClientRequest *req,
   dout(10) << "reply to " << *req << " readdir " << numfiles << " files" << endl;
   reply->set_result(0);
   
-  logger->inc("ordir");
   timepair_t now = g_clock.gettimepair();
   stat_read.hit(now);
   stat_req.hit(now);