]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: use __func__ in log messages
authorKefu Chai <kchai@redhat.com>
Mon, 9 Mar 2015 08:47:30 +0000 (16:47 +0800)
committerSage Weil <sage@redhat.com>
Thu, 8 Oct 2015 03:06:02 +0000 (23:06 -0400)
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 0f7f35670f03f3f58329c00d323963710e7e495d)

src/osd/OSD.cc

index 705b13dbd5640f3a721e41d5d88ce2efb2bffe8d..4c7120b05a6a1d887e1a5d27c068a8e81ea7cbda 100644 (file)
@@ -5926,11 +5926,11 @@ bool OSD::scrub_time_permit(utime_t now)
     }    
   }
   if (!time_permit) {
-    dout(20) << "scrub_should_schedule should run between " << cct->_conf->osd_scrub_begin_hour
+    dout(20) << __func__ << " should run between " << cct->_conf->osd_scrub_begin_hour
             << " - " << cct->_conf->osd_scrub_end_hour
             << " now " << bdt.tm_hour << " = no" << dendl;
   } else {
-    dout(20) << "scrub_should_schedule should run between " << cct->_conf->osd_scrub_begin_hour
+    dout(20) << __func__ << " should run between " << cct->_conf->osd_scrub_begin_hour
             << " - " << cct->_conf->osd_scrub_end_hour
             << " now " << bdt.tm_hour << " = yes" << dendl;
   }
@@ -5944,12 +5944,12 @@ bool OSD::scrub_should_schedule()
   }
   double loadavgs[1];
   if (getloadavg(loadavgs, 1) != 1) {
-    dout(10) << "scrub_should_schedule couldn't read loadavgs\n" << dendl;
+    dout(10) << __func__ << " couldn't read loadavgs\n" << dendl;
     return false;
   }
 
   if (loadavgs[0] >= cct->_conf->osd_scrub_load_threshold) {
-    dout(20) << "scrub_should_schedule loadavg " << loadavgs[0]
+    dout(20) << __func__ << " loadavg " << loadavgs[0]
             << " >= max " << cct->_conf->osd_scrub_load_threshold
             << " = no, load too high" << dendl;
     return false;