From d3dadebc9e83269045e5c508cbd6eae8e7c8842a Mon Sep 17 00:00:00 2001 From: Enming Zhang Date: Fri, 15 Dec 2017 01:17:23 +0800 Subject: [PATCH] PG: use __func__ instead of an explicit function name in dout Signed-off-by: Enming Zhang --- src/osd/PG.cc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 7a7b09eb3d7..6d6ca365965 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -1432,13 +1432,13 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id, if (auth_log_shard == all_info.end()) { if (up != acting) { - dout(10) << "choose_acting no suitable info found (incomplete backfills?)," + dout(10) << __func__ << " no suitable info found (incomplete backfills?)," << " reverting to up" << dendl; want_acting = up; vector empty; osd->queue_want_pg_temp(info.pgid.pgid, empty); } else { - dout(10) << "choose_acting failed" << dendl; + dout(10) << __func__ << " failed" << dendl; assert(want_acting.empty()); } return false; @@ -1496,7 +1496,7 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id, (pool.info.is_erasure() || !cct->_conf->osd_allow_recovery_below_min_size)) { want_acting.clear(); - dout(10) << "choose_acting failed, below min size" << dendl; + dout(10) << __func__ << " failed, below min size" << dendl; return false; } @@ -1505,12 +1505,12 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id, get_pgbackend()->get_is_recoverable_predicate()); if (!(*recoverable_predicate)(have)) { want_acting.clear(); - dout(10) << "choose_acting failed, not recoverable" << dendl; + dout(10) << __func__ << " failed, not recoverable" << dendl; return false; } if (want != acting) { - dout(10) << "choose_acting want " << want << " != acting " << acting + dout(10) << __func__ << " want " << want << " != acting " << acting << ", requesting pg_temp change" << dendl; want_acting = want; @@ -1539,7 +1539,7 @@ bool PG::choose_acting(pg_shard_t &auth_log_shard_id, ++i) { assert(stray_set.find(*i) == stray_set.end()); } - dout(10) << "choose_acting want " << want << " (== acting) backfill_targets " + dout(10) << __func__ << " want " << want << " (== acting) backfill_targets " << want_backfill << dendl; return true; } -- 2.47.3