* separate debug_paxos setting

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

diff --git a/trunk/ceph/config.cc b/trunk/ceph/config.cc
index e9385a2646cce0149068ced72b73819aa8a71f72..1066a88a67ac6b553f5312e5ab0f8328b370d7fb 100644 (file)
--- a/trunk/ceph/config.cc
+++ b/trunk/ceph/config.cc
@@ -93,6 +93,7 @@ md_config_t g_conf = {
   debug_ns: 0,
   debug_ms: 0,
   debug_mon: 0,
+  debug_paxos: 0,
   
   debug_after: 0,
   

diff --git a/trunk/ceph/config.h b/trunk/ceph/config.h
index bf0d27aeb9d898c1e10183afe4dcfd2cf27a841b..7cfd600d7daeb3e3fdc71a57075805daf551f22b 100644 (file)
--- a/trunk/ceph/config.h
+++ b/trunk/ceph/config.h
@@ -81,6 +81,7 @@ struct md_config_t {
   int debug_ns;
   int debug_ms;
   int debug_mon;
+  int debug_paxos;
 
   int debug_after;
 

diff --git a/trunk/ceph/mon/Paxos.cc b/trunk/ceph/mon/Paxos.cc
index ebe965752b026d449ec125a57ed39bedce82d47a..0ecf0f5a6caf8acc8b2106f076261adcb5d29ca5 100644 (file)
--- a/trunk/ceph/mon/Paxos.cc
+++ b/trunk/ceph/mon/Paxos.cc
@@ -20,8 +20,8 @@
 
 #include "config.h"
 #undef dout
-#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
+#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) cerr << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) cout << g_clock.now() << " mon" << whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxos(" << machine_name << " " << get_statename(state) << " lc " << last_committed << ") "
 
 
 void Paxos::init()

diff --git a/trunk/ceph/mon/PaxosService.cc b/trunk/ceph/mon/PaxosService.cc
index 0816b0db467b06a184c00c959bf201c12fe9b252..6f4fba2d6c27dafde48e8556249bb21fad17342a 100644 (file)
--- a/trunk/ceph/mon/PaxosService.cc
+++ b/trunk/ceph/mon/PaxosService.cc
@@ -20,7 +20,7 @@
 
 #include "config.h"
 #undef dout
-#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cout << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxosservice(" << get_paxos_name(paxos->machine_id) << ") "
+#define  dout(l) if (l<=g_conf.debug || l<=g_conf.debug_paxos) cout << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << ".paxosservice(" << get_paxos_name(paxos->machine_id) << ") "
 //#define  derr(l) if (l<=g_conf.debug || l<=g_conf.debug_mon) cerr << g_clock.now() << " mon" << mon->whoami << (mon->is_starting() ? (const char*)"(starting)":(mon->is_leader() ? (const char*)"(leader)":(mon->is_peon() ? (const char*)"(peon)":(const char*)"(?\?)"))) << "." << get_paxos_name(paxos->machine_id) << " "