From e83ad7c41d42a0de6aa66ec0880237eafa06305d Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@newdream.net>
Date: Tue, 16 Jun 2009 16:48:10 -0700
Subject: [PATCH] librados: clean up librados debug output a bit

---
 src/config.cc   |  1 +
 src/config.h    |  1 +
 src/librados.cc | 17 +++++++++++------
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/config.cc b/src/config.cc
index 766e489fbcf2e..5c9290f80ff64 100644
--- a/src/config.cc
+++ b/src/config.cc
@@ -309,6 +309,7 @@ static struct config_option config_optionsp[] = {
 	OPTION(debug_timer, 0, OPT_INT, 0),
 	OPTION(debug_filer, 0, OPT_INT, 0),
 	OPTION(debug_objecter, 0, OPT_INT, 0),
+	OPTION(debug_rados, 0, OPT_INT, 1),
 	OPTION(debug_journaler, 0, OPT_INT, 0),
 	OPTION(debug_objectcacher, 0, OPT_INT, 0),
 	OPTION(debug_client, 0, OPT_INT, 0),
diff --git a/src/config.h b/src/config.h
index 884349a3d82e1..a3632416de7fd 100644
--- a/src/config.h
+++ b/src/config.h
@@ -85,6 +85,7 @@ struct md_config_t {
   int debug_timer;
   int debug_filer;
   int debug_objecter;
+  int debug_rados;
   int debug_journaler;
   int debug_objectcacher;
   int debug_client;
diff --git a/src/librados.cc b/src/librados.cc
index 6d397d985e55c..dcb3f84303088 100644
--- a/src/librados.cc
+++ b/src/librados.cc
@@ -44,6 +44,12 @@ using namespace std;
 #include "include/librados.h"
 
 
+#define DOUT_SUBSYS rados
+#undef dout_prefix
+#define dout_prefix *_dout << dbeginl << "librados: "
+
+
+
 class RadosClient : public Dispatcher
 {
   MonMap monmap;
@@ -273,10 +279,9 @@ bool RadosClient::init()
     return false;
 
   rank.bind();
-  cout << "starting radosclient." << g_conf.id
-       << " at " << rank.get_rank_addr() 
-       << " fsid " << monmap.get_fsid()
-       << std::endl;
+  dout(1) << "starting at " << rank.get_rank_addr() 
+	  << " fsid " << monmap.get_fsid()
+	  << dendl;
 
   messenger = rank.register_entity(entity_name_t::CLIENT(-1));
   assert_warn(messenger);
@@ -307,12 +312,12 @@ bool RadosClient::init()
   objecter->init();
 
   while (osdmap.get_epoch() == 0) {
-    dout(0) << "waiting for osdmap" << dendl;
+    dout(1) << "waiting for osdmap" << dendl;
     cond.Wait(lock);
   }
   lock.Unlock();
 
-  dout(0) << "init done" << dendl;
+  dout(1) << "init done" << dendl;
 
   return true;
 }
-- 
2.39.5