From 9c130336a1a1dcf2338d202914aeacbc194af0b0 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 9 Mar 2015 16:47:30 +0800 Subject: [PATCH] osd: use __func__ in log messages Signed-off-by: Kefu Chai (cherry picked from commit 0f7f35670f03f3f58329c00d323963710e7e495d) --- src/osd/OSD.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 705b13dbd5640..4c7120b05a6a1 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -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; -- 2.39.5