From a4bd3987b208ff019dcffd3efcbe16f1e8482a12 Mon Sep 17 00:00:00 2001
From: sage <sage@29311d96-e01e-0410-9327-a35deaab8ce9>
Date: Tue, 14 Jun 2005 21:03:02 +0000
Subject: [PATCH] *** empty log message ***

git-svn-id: https://ceph.svn.sf.net/svnroot/ceph@315 29311d96-e01e-0410-9327-a35deaab8ce9
---
 ceph/TODO           |  2 --
 ceph/config.cc      |  4 +++-
 ceph/config.h       |  4 +++-
 ceph/mds/MDCache.cc | 43 ++++++++++++++++++++++---------------------
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/ceph/TODO b/ceph/TODO
index 9d6590c14767b..761bb731d886f 100644
--- a/ceph/TODO
+++ b/ceph/TODO
@@ -1,9 +1,7 @@
 
 !!!
 - test mds scaling w/ makedirs, vs mds_log_on_request 
-- client needs to choose MDS intelligently
 
-- fix up MDLog
 
 big fast todo's:
 - client buffer cache
diff --git a/ceph/config.cc b/ceph/config.cc
index 12866bdc0d0de..0cb8542b3f973 100644
--- a/ceph/config.cc
+++ b/ceph/config.cc
@@ -17,10 +17,12 @@ md_config_t g_conf = {
   num_client: 1,
 
   // profiling and debugging
-  log_messages: true,
   log_interval: 1,
   log_name: (char*)0,
 
+  log_messages: true,
+  log_pins: false,
+
   fake_clock: false,
   fakemessenger_serialize: true,
 
diff --git a/ceph/config.h b/ceph/config.h
index 2715abfb82ef2..48da001ec764c 100644
--- a/ceph/config.h
+++ b/ceph/config.h
@@ -8,10 +8,12 @@ struct md_config_t {
 
 
   // profiling
-  bool log_messages;
   int   log_interval;
   char *log_name;
 
+  bool log_messages;
+  bool log_pins;
+
   bool fake_clock;
   bool fakemessenger_serialize;
 
diff --git a/ceph/mds/MDCache.cc b/ceph/mds/MDCache.cc
index 3fb20fa5271ab..ab11385a1b23d 100644
--- a/ceph/mds/MDCache.cc
+++ b/ceph/mds/MDCache.cc
@@ -1493,28 +1493,29 @@ void MDCache::request_cleanup(Message *req)
   mds->logger->set("cpin", lru.lru_get_num_pinned());
   mds->logger->set("cmax", lru.lru_get_max());
 
-  // pin
-  for (map<int,int>::iterator it = cinode_pins.begin();
-	   it != cinode_pins.end();
-	   it++) {
-	//string s = "I";
-	//s += cinode_pin_names[it->first];
-	mds->logger2->set(//s, 
-					  cinode_pin_names[it->first],
-					  it->second);
-  }
-  /*
-  for (map<int,int>::iterator it = cdir_pins.begin();
-	   it != cdir_pins.end();
-	   it++) {
-	//string s = "D";
-	//s += cdir_pin_names[it->first];
-	mds->logger2->set(//s, 
-					  cdir_pin_names[it->first],
-					  it->second);
+  if (g_conf.log_pins) {
+	// pin
+	for (map<int,int>::iterator it = cinode_pins.begin();
+		 it != cinode_pins.end();
+		 it++) {
+	  //string s = "I";
+	  //s += cinode_pin_names[it->first];
+	  mds->logger2->set(//s, 
+						cinode_pin_names[it->first],
+						it->second);
+	}
+	/*
+	  for (map<int,int>::iterator it = cdir_pins.begin();
+	  it != cdir_pins.end();
+	  it++) {
+	  //string s = "D";
+	  //s += cdir_pin_names[it->first];
+	  mds->logger2->set(//s, 
+	  cdir_pin_names[it->first],
+	  it->second);
+	  }
+	*/
   }
-  */
-
 
 }
 
-- 
2.39.5