From: Enming Zhang <enming.zhang@umcloud.com>
Date: Fri, 15 Dec 2017 03:48:02 +0000 (+0800)
Subject: PG: clean up repeated calling and use __func__ in dout
X-Git-Tag: v13.0.2~676^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F19546%2Fhead;p=ceph.git

PG: clean up repeated calling and use __func__ in dout

Signed-off-by: Enming Zhang <enming.zhang@umcloud.com>
---

diff --git a/src/osd/PG.cc b/src/osd/PG.cc
index 6d6ca365965e..2d2dddf72d7d 100644
--- a/src/osd/PG.cc
+++ b/src/osd/PG.cc
@@ -1237,10 +1237,11 @@ void PG::calc_replicated_acting(
   set<pg_shard_t> *acting_backfill,
   ostream &ss)
 {
-  ss << "calc_acting newest update on osd." << auth_log_shard->first
+  pg_shard_t auth_log_shard_id = auth_log_shard->first;
+
+  ss << __func__ << " newest update on osd." << auth_log_shard_id
      << " with " << auth_log_shard->second
      << (restrict_to_up_acting ? " restrict_to_up_acting" : "") << std::endl;
-  pg_shard_t auth_log_shard_id = auth_log_shard->first;
   
   // select primary
   map<pg_shard_t,pg_info_t>::const_iterator primary;
@@ -1257,7 +1258,7 @@ void PG::calc_replicated_acting(
     primary = auth_log_shard;
   }
 
-  ss << "calc_acting primary is osd." << primary->first
+  ss << __func__ << " primary is osd." << primary->first
      << " with " << primary->second << std::endl;
   want->push_back(primary->first.osd);
   acting_backfill->insert(primary->first);