mon: Monitor's clog/audit_clog need to accessed as pointers

:1,$s/clog\./clog->/

Signed-off-by: Joao Eduardo Luis <joao.luis@inktank.com>

diff --git a/src/mon/DataHealthService.cc b/src/mon/DataHealthService.cc
index 77004fa46938db514f3249cfce0119c1a6689cce..780a71d09f390545fdd84ac1f65e4e919917cd70 100644 (file)
--- a/src/mon/DataHealthService.cc
+++ b/src/mon/DataHealthService.cc
@@ -226,7 +226,7 @@ void DataHealthService::service_tick()
   // already low available disk space.
   if (ours.latest_avail_percent <= g_conf->mon_data_avail_warn) {
     if (ours.latest_avail_percent != last_warned_percent)
-      mon->clog.warn()
+      mon->clog->warn()
        << "reached concerning levels of available space on local monitor storage"
        << " (" << ours.latest_avail_percent << "% free)\n";
     last_warned_percent = ours.latest_avail_percent;

diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc
index 3e22a5431a852bebcdd73889eaee4fada72eb819..91a414f8518b8315fc8cfbc4e04484da890abd83 100644 (file)
--- a/src/mon/MDSMonitor.cc
+++ b/src/mon/MDSMonitor.cc
@@ -525,7 +525,7 @@ bool MDSMonitor::should_propose(double& delay)
 void MDSMonitor::_updated(MMDSBeacon *m)
 {
   dout(10) << "_updated " << m->get_orig_source() << " " << *m << dendl;
-  mon->clog.info() << m->get_orig_source_inst() << " "
+  mon->clog->info() << m->get_orig_source_inst() << " "
          << ceph_mds_state_name(m->get_state()) << "\n";
 
   if (m->get_state() == MDSMap::STATE_STOPPED) {
@@ -542,7 +542,7 @@ void MDSMonitor::on_active()
   update_logger();
 
   if (mon->is_leader())
-    mon->clog.info() << "mdsmap " << mdsmap << "\n";
+    mon->clog->info() << "mdsmap " << mdsmap << "\n";
 }
 
 void MDSMonitor::get_health(list<pair<health_status_t, string> >& summary,

diff --git a/src/mon/MonmapMonitor.cc b/src/mon/MonmapMonitor.cc
index 3890704e852dccf76d4cee75baa76902c13d9a38..e953d561bede0a32f0113872c7d2aef4aabdf86b 100644 (file)
--- a/src/mon/MonmapMonitor.cc
+++ b/src/mon/MonmapMonitor.cc
@@ -123,7 +123,7 @@ void MonmapMonitor::on_active()
   }
 
   if (mon->is_leader())
-    mon->clog.info() << "monmap " << *mon->monmap << "\n";
+    mon->clog->info() << "monmap " << *mon->monmap << "\n";
 }
 
 bool MonmapMonitor::preprocess_query(PaxosServiceMessage *m)

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index fb2157f23f394e26920a9c38ff326b431f306e21..925081b9c12434d2eca4394dc9b5fe8e892752ed 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -403,7 +403,7 @@ void OSDMonitor::on_active()
   }
 
   if (mon->is_leader())
-    mon->clog.info() << "osdmap " << osdmap << "\n"; 
+    mon->clog->info() << "osdmap " << osdmap << "\n"; 
 
   if (!mon->is_leader()) {
     list<MOSDFailure*> ls;
@@ -982,7 +982,7 @@ bool OSDMonitor::prepare_mark_me_down(MOSDMarkMeDown *m)
   assert(osdmap.is_up(target_osd));
   assert(osdmap.get_addr(target_osd) == m->get_target().addr);
 
-  mon->clog.info() << "osd." << target_osd << " marked itself down\n";
+  mon->clog->info() << "osd." << target_osd << " marked itself down\n";
   pending_inc.new_state[target_osd] = CEPH_OSD_UP;
   if (m->request_ack)
     wait_for_finished_proposal(new C_AckMarkedDown(this, m));
@@ -1128,7 +1128,7 @@ bool OSDMonitor::check_failure(utime_t now, int target_osd, failure_info_t& fi)
     dout(1) << " we have enough reports/reporters to mark osd." << target_osd << " down" << dendl;
     pending_inc.new_state[target_osd] = CEPH_OSD_UP;
 
-    mon->clog.info() << osdmap.get_inst(target_osd) << " failed ("
+    mon->clog->info() << osdmap.get_inst(target_osd) << " failed ("
                     << fi.num_reports << " reports from " << (int)fi.reporters.size() << " peers after "
                     << failed_for << " >= grace " << grace << ")\n";
     return true;
@@ -1152,7 +1152,7 @@ bool OSDMonitor::prepare_failure(MOSDFailure *m)
   
   if (m->if_osd_failed()) {
     // add a report
-    mon->clog.debug() << m->get_target() << " reported failed by "
+    mon->clog->debug() << m->get_target() << " reported failed by "
                      << m->get_orig_source_inst() << "\n";
     failure_info_t& fi = failure_info[target_osd];
     MOSDFailure *old = fi.add_report(reporter, failed_since, m);
@@ -1164,7 +1164,7 @@ bool OSDMonitor::prepare_failure(MOSDFailure *m)
     return check_failure(now, target_osd, fi);
   } else {
     // remove the report
-    mon->clog.debug() << m->get_target() << " failure report canceled by "
+    mon->clog->debug() << m->get_target() << " failure report canceled by "
                      << m->get_orig_source_inst() << "\n";
     if (failure_info.count(target_osd)) {
       failure_info_t& fi = failure_info[target_osd];
@@ -1446,7 +1446,7 @@ void OSDMonitor::_booted(MOSDBoot *m, bool logit)
          << " w " << m->sb.weight << " from " << m->sb.current_epoch << dendl;
 
   if (logit) {
-    mon->clog.info() << m->get_orig_source_inst() << " boot\n";
+    mon->clog->info() << m->get_orig_source_inst() << " boot\n";
   }
 
   send_latest(m, m->sb.current_epoch+1);
@@ -1497,7 +1497,7 @@ bool OSDMonitor::prepare_alive(MOSDAlive *m)
   int from = m->get_orig_source().num();
 
   if (0) {  // we probably don't care much about these
-    mon->clog.debug() << m->get_orig_source_inst() << " alive\n";
+    mon->clog->debug() << m->get_orig_source_inst() << " alive\n";
   }
 
   dout(7) << "prepare_alive want up_thru " << m->want << " have " << m->version
@@ -1969,7 +1969,7 @@ void OSDMonitor::tick()
 
          do_propose = true;
        
-         mon->clog.info() << "osd." << o << " out (down for " << down << ")\n";
+         mon->clog->info() << "osd." << o << " out (down for " << down << ")\n";
        } else
          continue;
       }
@@ -2058,7 +2058,7 @@ void OSDMonitor::handle_osd_timeouts(const utime_t &now,
     } else if (can_mark_down(i)) {
       utime_t diff = now - t->second;
       if (diff > timeo) {
-       mon->clog.info() << "osd." << i << " marked down after no pg stats for " << diff << "seconds\n";
+       mon->clog->info() << "osd." << i << " marked down after no pg stats for " << diff << "seconds\n";
        derr << "no osd or pg stats from osd." << i << " since " << t->second << ", " << diff
             << " seconds ago.  marking down" << dendl;
        pending_inc.new_state[i] = CEPH_OSD_UP;
@@ -3015,7 +3015,7 @@ bool OSDMonitor::update_pools_status()
       if (pool_is_full)
         continue;
 
-      mon->clog.info() << "pool '" << pool_name
+      mon->clog->info() << "pool '" << pool_name
                        << "' no longer full; removing FULL flag";
 
       update_pool_flags(it->first, pool.get_flags() & ~pg_pool_t::FLAG_FULL);
@@ -3026,12 +3026,12 @@ bool OSDMonitor::update_pools_status()
 
       if (pool.quota_max_bytes > 0 &&
           (uint64_t)sum.num_bytes >= pool.quota_max_bytes) {
-        mon->clog.warn() << "pool '" << pool_name << "' is full"
+        mon->clog->warn() << "pool '" << pool_name << "' is full"
                          << " (reached quota's max_bytes: "
                          << si_t(pool.quota_max_bytes) << ")";
       } else if (pool.quota_max_objects > 0 &&
                 (uint64_t)sum.num_objects >= pool.quota_max_objects) {
-        mon->clog.warn() << "pool '" << pool_name << "' is full"
+        mon->clog->warn() << "pool '" << pool_name << "' is full"
                          << " (reached quota's max_objects: "
                          << pool.quota_max_objects << ")";
       } else {

diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc
index d6ff07225761e8959a0b0b2986aeac4bfdb9cade..218fe845902000174881618fc6ff1cac632e0d76 100644 (file)
--- a/src/mon/PGMonitor.cc
+++ b/src/mon/PGMonitor.cc
@@ -80,7 +80,7 @@ void PGMonitor::on_active()
   update_logger();
 
   if (mon->is_leader())
-    mon->clog.info() << "pgmap " << pg_map << "\n";
+    mon->clog->info() << "pgmap " << pg_map << "\n";
 }
 
 void PGMonitor::update_logger()

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index 2dad7a07d0d69e0525eea6e8c2302128027ca951..f439410ef58a63f342b7622f27bb573508a3ce9c 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -973,7 +973,7 @@ void Paxos::warn_on_future_time(utime_t t, entity_name_t from)
       utime_t warn_diff = now - last_clock_drift_warn;
       if (warn_diff >
          pow(g_conf->mon_clock_drift_warn_backoff, clock_drift_warned)) {
-       mon->clog.warn() << "message from " << from << " was stamped " << diff
+       mon->clog->warn() << "message from " << from << " was stamped " << diff
                         << "s in the future, clocks not synchronized";
        last_clock_drift_warn = ceph_clock_now(g_ceph_context);
        ++clock_drift_warned;