osd: be a bit more verbose on startup

load_pgs can take a while and it is nice to know what ceph-osd is doing
without cranking up logging.

Did a quick audit of dout(1)'s and making this the default.  This lets us
see basic OSD state changes (load_pgs, boot, active) at the default level.

At this point all osd state changes should be logged at level 1.

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 3549e5465ecdadaca48c90cee5c039f78e2a9943..5ed90e074362a000147424a3ed3dbdf6ca1ad1c3 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -75,7 +75,7 @@ SUBSYS(rbd, 0, 5)
 SUBSYS(journaler, 0, 5)
 SUBSYS(objectcacher, 0, 5)
 SUBSYS(client, 0, 5)
-SUBSYS(osd, 0, 5)
+SUBSYS(osd, 1, 5)
 SUBSYS(optracker, 0, 5)
 SUBSYS(objclass, 0, 5)
 SUBSYS(filestore, 1, 3)

diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc
index d3d14f96f62fe16269ac9493dfd55e52d87ae643..ad4b5af577fae5732bce0851e8e7e827032f1e25 100644 (file)
--- a/src/osd/OSD.cc
+++ b/src/osd/OSD.cc
@@ -1254,7 +1254,7 @@ int OSD::init()
   consume_map();
   peering_wq.drain();
 
-  dout(10) << "done with init, starting boot process" << dendl;
+  dout(1) << "done with init, starting boot process" << dendl;
   state = STATE_BOOTING;
   start_boot();
 
@@ -1975,7 +1975,7 @@ PG *OSD::_lookup_lock_pg_with_map_lock_held(spg_t pgid)
 void OSD::load_pgs()
 {
   assert(osd_lock.is_locked());
-  dout(10) << "load_pgs" << dendl;
+  dout(1) << "load_pgs" << dendl;
   assert(pg_map.empty());
 
   vector<coll_t> ls;
@@ -2104,7 +2104,7 @@ void OSD::load_pgs()
     dout(10) << "load_pgs loaded " << *pg << " " << pg->pg_log.get_log() << dendl;
     pg->unlock();
   }
-  dout(10) << "load_pgs done" << dendl;
+  dout(1) << "load_pgs opened " << pg_map.size() << " pgs" << dendl;
   
   build_past_intervals_parallel();
 }
@@ -3538,7 +3538,7 @@ void OSD::ms_handle_connect(Connection *con)
 bool OSD::ms_handle_reset(Connection *con)
 {
   OSD::Session *session = (OSD::Session *)con->get_priv();
-  dout(1) << "ms_handle_reset con " << con << " session " << session << dendl;
+  dout(2) << "ms_handle_reset con " << con << " session " << session << dendl;
   if (!session)
     return false;
   session->wstate.reset();
@@ -5112,6 +5112,7 @@ bool OSDService::prepare_to_stop()
 
   OSDMapRef osdmap = get_osdmap();
   if (osdmap && osdmap->is_up(whoami)) {
+    dout(1) << __func__ << " telling mon we are shutting down" << dendl;
     state = PREPARING_TO_STOP;
     monc->send_mon_message(new MOSDMarkMeDown(monc->get_fsid(),
                                              osdmap->get_inst(whoami),
@@ -5126,6 +5127,7 @@ bool OSDService::prepare_to_stop()
       is_stopping_cond.WaitUntil(is_stopping_lock, timeout);
     }
   }
+  dout(1) << __func__ << " starting shutdown" << dendl;
   state = STOPPING;
   return true;
 }
@@ -5133,7 +5135,7 @@ bool OSDService::prepare_to_stop()
 void OSDService::got_stop_ack()
 {
   Mutex::Locker l(is_stopping_lock);
-  dout(10) << "Got stop ack" << dendl;
+  dout(1) << __func__ << " starting shutdown" << dendl;
   state = STOPPING;
   is_stopping_cond.Signal();
 }