mon: only log osd boot once

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 9b788653314f97de5aac5eaac94d0992ed5c085b..866ee98d4a3cba8b120567bb8f5ad70e75af7973 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -472,7 +472,7 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m)
     // yup.
     dout(7) << "preprocess_boot dup from " << m->get_orig_source_inst()
            << " == " << osdmap.get_inst(from) << dendl;
-    _booted(m);
+    _booted(m, false);
     return true;
   }
 
@@ -482,10 +482,7 @@ bool OSDMonitor::preprocess_boot(MOSDBoot *m)
 
 bool OSDMonitor::prepare_boot(MOSDBoot *m)
 {
-  stringstream ss;
   dout(7) << "prepare_boot from " << m->get_orig_source_inst() << " sb " << m->sb << dendl;
-  ss << m->get_orig_source_inst() << " boot";
-  mon->get_logclient()->log(LOG_DEBUG, ss);
 
   assert(m->get_orig_source().is_osd());
   int from = m->get_orig_source().num();
@@ -544,11 +541,16 @@ bool OSDMonitor::prepare_boot(MOSDBoot *m)
   return true;
 }
 
-void OSDMonitor::_booted(MOSDBoot *m)
+void OSDMonitor::_booted(MOSDBoot *m, bool logit)
 {
   dout(7) << "_booted " << m->get_orig_source_inst() 
          << " w " << m->sb.weight << " from " << m->sb.current_epoch << dendl;
   send_latest(m->get_orig_source_inst(), m->sb.current_epoch+1);
+
+  stringstream ss;
+  ss << m->get_orig_source_inst() << " boot";
+  mon->get_logclient()->log(LOG_DEBUG, ss);
+
   delete m;
 }
 

diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h
index 698bd4f4be5d46e687ca51a06c3a38d1e8aa412e..2a93bda44b5ea6e624c2cb67c95788794f7de9da 100644 (file)
--- a/src/mon/OSDMonitor.h
+++ b/src/mon/OSDMonitor.h
@@ -77,7 +77,7 @@ private:
 
   bool preprocess_boot(class MOSDBoot *m);
   bool prepare_boot(class MOSDBoot *m);
-  void _booted(MOSDBoot *m);
+  void _booted(MOSDBoot *m, bool logit);
 
   bool preprocess_alive(class MOSDAlive *m);
   bool prepare_alive(class MOSDAlive *m);
@@ -90,7 +90,7 @@ private:
       cmon(cm), m(m_) {}
     void finish(int r) {
       if (r >= 0)
-       cmon->_booted(m);
+       cmon->_booted(m, true);
       else
        cmon->dispatch((Message*)m);
     }