mds: clean up log level 2 messages

Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>
(cherry picked from commit a225c266052d09ffcb066aead83a18dec918aa35)

Conflicts:
	src/mds/MDSRank.cc

diff --git a/src/mds/MDBalancer.cc b/src/mds/MDBalancer.cc
index 39abb57ba60516a9cd03832e175f70eb9fdb5a8b..d5c026c327f9f8cae53f2d8a9763086542884903 100644 (file)
--- a/src/mds/MDBalancer.cc
+++ b/src/mds/MDBalancer.cc
@@ -813,7 +813,7 @@ int MDBalancer::mantle_prep_rebalance()
   /* execute the balancer */
   Mantle mantle;
   int ret = mantle.balance(bal_code, mds->get_nodeid(), metrics, state.targets);
-  dout(2) << " mantle decided that new targets=" << state.targets << dendl;
+  dout(5) << " mantle decided that new targets=" << state.targets << dendl;
 
   /* mantle doesn't know about cluster size, so check target len here */
   if ((int) state.targets.size() != cluster_size)

diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc
index d7b40a3126f6522e7bfbf3a924ae1b114ddc69c4..8322e0324f21b7f1685f6346834d8b9f3a5aa896 100644 (file)
--- a/src/mds/MDCache.cc
+++ b/src/mds/MDCache.cc
@@ -7482,7 +7482,7 @@ void MDCache::check_memory_usage()
   if (CInode::count())
     caps_per_inode = (double)Capability::count() / (double)CInode::count();
 
-  dout(2) << "check_memory_usage"
+  dout(2) << "Memory usage: "
           << " total " << last.get_total()
           << ", rss " << last.get_rss()
           << ", heap " << last.get_heap()
@@ -7508,7 +7508,7 @@ void MDCache::check_memory_usage()
     // Only do this once we are back in bounds: otherwise the releases would
     // slow down whatever process caused us to exceed bounds to begin with
     if (ceph_using_tcmalloc()) {
-      dout(2) << "check_memory_usage: releasing unused space from tcmalloc" 
+      dout(5) << "check_memory_usage: releasing unused space from tcmalloc"
              << dendl;
       ceph_heap_release_free_memory();
     }
@@ -7558,7 +7558,7 @@ void MDCache::shutdown_check()
 
 void MDCache::shutdown_start()
 {
-  dout(2) << "shutdown_start" << dendl;
+  dout(5) << "shutdown_start" << dendl;
 
   if (g_conf->mds_shutdown_check)
     mds->timer.add_event_after(g_conf->mds_shutdown_check, new C_MDC_ShutdownCheck(this));
@@ -7755,7 +7755,7 @@ bool MDCache::shutdown_pass()
   }
 
   // done!
-  dout(2) << "shutdown done." << dendl;
+  dout(5) << "shutdown done." << dendl;
   return true;
 }
 

diff --git a/src/mds/MDSRank.cc b/src/mds/MDSRank.cc
index b196b5044ba280f43575952b86f6346909699c3c..2bc0095b08043989ea6d34b0821df0da45f8cce7 100644 (file)
--- a/src/mds/MDSRank.cc
+++ b/src/mds/MDSRank.cc
@@ -1474,27 +1474,27 @@ void MDSRank::boot_start(BootStep step, int r)
 
         MDSGatherBuilder gather(g_ceph_context,
             new C_MDS_BootStart(this, MDS_BOOT_OPEN_ROOT));
-        dout(2) << "boot_start " << step << ": opening inotable" << dendl;
+        dout(2) << "Booting: " << step << ": opening inotable" << dendl;
         inotable->set_rank(whoami);
         inotable->load(gather.new_sub());
 
-        dout(2) << "boot_start " << step << ": opening sessionmap" << dendl;
+        dout(2) << "Booting: " << step << ": opening sessionmap" << dendl;
         sessionmap.set_rank(whoami);
         sessionmap.load(gather.new_sub());
 
-        dout(2) << "boot_start " << step << ": opening mds log" << dendl;
+        dout(2) << "Booting: " << step << ": opening mds log" << dendl;
         mdlog->open(gather.new_sub());
 
        if (is_starting()) {
-         dout(2) << "boot_start " << step << ": opening purge queue" << dendl;
+         dout(2) << "Booting: " << step << ": opening purge queue" << dendl;
          purge_queue.open(new C_IO_Wrapper(this, gather.new_sub()));
        } else if (!standby_replaying) {
-         dout(2) << "boot_start " << step << ": opening purge queue (async)" << dendl;
+         dout(2) << "Booting: " << step << ": opening purge queue (async)" << dendl;
          purge_queue.open(NULL);
        }
 
         if (mdsmap->get_tableserver() == whoami) {
-          dout(2) << "boot_start " << step << ": opening snap table" << dendl;
+          dout(2) << "Booting: " << step << ": opening snap table" << dendl;
           snapserver->set_rank(whoami);
           snapserver->load(gather.new_sub());
         }
@@ -1504,7 +1504,7 @@ void MDSRank::boot_start(BootStep step, int r)
       break;
     case MDS_BOOT_OPEN_ROOT:
       {
-        dout(2) << "boot_start " << step << ": loading/discovering base inodes" << dendl;
+        dout(2) << "Booting: " << step << ": loading/discovering base inodes" << dendl;
 
         MDSGatherBuilder gather(g_ceph_context,
             new C_MDS_BootStart(this, MDS_BOOT_PREPARE_LOG));
@@ -1527,19 +1527,19 @@ void MDSRank::boot_start(BootStep step, int r)
       break;
     case MDS_BOOT_PREPARE_LOG:
       if (is_any_replay()) {
-       dout(2) << "boot_start " << step << ": replaying mds log" << dendl;
+       dout(2) << "Booting: " << step << ": replaying mds log" << dendl;
        MDSGatherBuilder gather(g_ceph_context,
            new C_MDS_BootStart(this, MDS_BOOT_REPLAY_DONE));
 
        if (!standby_replaying) {
-         dout(2) << "boot_start " << step << ": waiting for purge queue recovered" << dendl;
+         dout(2) << "Booting: " << step << ": waiting for purge queue recovered" << dendl;
          purge_queue.wait_for_recovery(new C_IO_Wrapper(this, gather.new_sub()));
        }
 
        mdlog->replay(gather.new_sub());
        gather.activate();
       } else {
-        dout(2) << "boot_start " << step << ": positioning at end of old mds log" << dendl;
+        dout(2) << "Booting: " << step << ": positioning at end of old mds log" << dendl;
         mdlog->append();
         starting_done();
       }
@@ -1984,7 +1984,7 @@ void MDSRank::boot_create()
 
 void MDSRank::stopping_start()
 {
-  dout(2) << "stopping_start" << dendl;
+  dout(2) << "Stopping..." << dendl;
 
   if (mdsmap->get_num_in_mds() == 1 && !sessionmap.empty()) {
     // we're the only mds up!
@@ -1997,7 +1997,7 @@ void MDSRank::stopping_start()
 
 void MDSRank::stopping_done()
 {
-  dout(2) << "stopping_done" << dendl;
+  dout(2) << "Finished stopping..." << dendl;
 
   // tell monitor we shut down cleanly.
   request_state(MDSMap::STATE_STOPPED);

diff --git a/src/mds/Server.cc b/src/mds/Server.cc
index 9d9b5f98256a46daa1eb7c0a768f4e5967280fef..9846ea578d7dea4d2fd7fb416c22526fa5eb7b26 100644 (file)
--- a/src/mds/Server.cc
+++ b/src/mds/Server.cc
@@ -733,7 +733,7 @@ class C_MDS_TerminatedSessions : public ServerContext {
 
 void Server::terminate_sessions()
 {
-  dout(2) << "terminate_sessions" << dendl;
+  dout(5) << "terminating all sessions..." << dendl;
 
   terminating_sessions = true;