debug: adjust default debug levels

Trim out most noise, keep things that are interesting.

Notably, we are logging each message sent and received, and we are logging
the filestore operations when they get queued.  Those may still benefit
from being turned off in high IOPS environments.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/common/admin_socket.cc b/src/common/admin_socket.cc
index c0bb83e4b7b97ddee992659c2b06a718e94720b9..dc5519c78824d72c908a2f99a7a234b85fdd944b 100644 (file)
--- a/src/common/admin_socket.cc
+++ b/src/common/admin_socket.cc
@@ -346,7 +346,7 @@ bool AdminSocket::do_accept()
                      << "' to " << p->second << " failed" << dendl;
       out.append("failed");
     } else {
-      ldout(m_cct, 20) << "AdminSocket: request '" << match << "' '" << args
+      ldout(m_cct, 5) << "AdminSocket: request '" << match << "' '" << args
                       << "' to " << p->second
                       << " returned " << out.length() << " bytes" << dendl;
     }

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 8a5f7e994d7c8baf86a80569420a355e3512bf43..1a93064f6618332c4c0bc7d62ee52eff1f9cc081 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -47,20 +47,20 @@ OPTION(mon_cluster_log_to_syslog, OPT_BOOL, false)
 OPTION(mon_cluster_log_file, OPT_STR, "/var/log/ceph/$cluster.log")
 
 DEFAULT_SUBSYS(0, 5)
-SUBSYS(lockdep, 0, 5)
-SUBSYS(context, 0, 5)
-SUBSYS(crush, 1, 5)
+SUBSYS(lockdep, 0, 1)
+SUBSYS(context, 0, 1)
+SUBSYS(crush, 1, 1)
 SUBSYS(mds, 1, 5)
 SUBSYS(mds_balancer, 1, 5)
 SUBSYS(mds_locker, 1, 5)
 SUBSYS(mds_log, 1, 5)
 SUBSYS(mds_log_expire, 1, 5)
 SUBSYS(mds_migrator, 1, 5)
-SUBSYS(buffer, 0, 0)
-SUBSYS(timer, 0, 5)
-SUBSYS(filer, 0, 5)
-SUBSYS(striper, 0, 5)
-SUBSYS(objecter, 0, 0)
+SUBSYS(buffer, 0, 1)
+SUBSYS(timer, 0, 1)
+SUBSYS(filer, 0, 1)
+SUBSYS(striper, 0, 1)
+SUBSYS(objecter, 0, 1)
 SUBSYS(rados, 0, 5)
 SUBSYS(rbd, 0, 5)
 SUBSYS(journaler, 0, 5)
@@ -69,15 +69,15 @@ SUBSYS(client, 0, 5)
 SUBSYS(osd, 0, 5)
 SUBSYS(optracker, 0, 5)
 SUBSYS(objclass, 0, 5)
-SUBSYS(filestore, 1, 5)
-SUBSYS(journal, 1, 5)
+SUBSYS(filestore, 1, 3)
+SUBSYS(journal, 1, 3)
 SUBSYS(ms, 0, 5)
 SUBSYS(mon, 1, 5)
-SUBSYS(monc, 0, 5)
+SUBSYS(monc, 0, 10)
 SUBSYS(paxos, 0, 5)
 SUBSYS(tp, 0, 5)
 SUBSYS(auth, 1, 5)
-SUBSYS(finisher, 1, 5)
+SUBSYS(finisher, 1, 1)
 SUBSYS(heartbeatmap, 1, 5)
 SUBSYS(perfcounter, 1, 5)
 SUBSYS(rgw, 1, 5)                 // log level for the Rados gateway

diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc
index 6f768611c6e0a8744f9b790ef419b391a68c89b2..702323ea4cb98f6e26f4bbd42d422c20bbcb19f0 100644 (file)
--- a/src/os/FileJournal.cc
+++ b/src/os/FileJournal.cc
@@ -1082,15 +1082,15 @@ void FileJournal::do_write(bufferlist& bl)
 
 void FileJournal::flush()
 {
-  dout(5) << "waiting for completions to empty" << dendl;
+  dout(10) << "waiting for completions to empty" << dendl;
   {
     Mutex::Locker l(finisher_lock);
     while (!completions_empty())
       finisher_cond.Wait(finisher_lock);
   }
-  dout(5) << "flush waiting for finisher" << dendl;
+  dout(10) << "flush waiting for finisher" << dendl;
   finisher->wait_for_empty();
-  dout(5) << "flush done" << dendl;
+  dout(10) << "flush done" << dendl;
 }
 
 

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index 191d3f7c5e564653bebb14df34697c81bb6be7fe..8ff5c659d5c1408a26f0f861728b6a729a3d5785 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -3137,12 +3137,12 @@ void OSD::do_waiters()
 
     finished_lock.Unlock();
     
-    dout(2) << "do_waiters -- start" << dendl;
+    dout(10) << "do_waiters -- start" << dendl;
     for (list<OpRequestRef>::iterator it = waiting.begin();
          it != waiting.end();
          it++)
       dispatch_op(*it);
-    dout(2) << "do_waiters -- finish" << dendl;
+    dout(10) << "do_waiters -- finish" << dendl;
   }
 }