From: Brad Hubbard <bhubbard@redhat.com>
Date: Wed, 4 Jan 2017 04:48:31 +0000 (+1000)
Subject: osd/osd_type: Fix logging output
X-Git-Tag: v12.0.0~303^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f3001f35ef0a040abef0b961bfaeca22e6f69c24;p=ceph.git

osd/osd_type: Fix logging output

Logging should reflect the actual function name.

Signed-off-by: Brad Hubbard <bhubbard@redhat.com>
---

diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc
index 3780d73b6054..5538025bcc0c 100644
--- a/src/osd/osd_types.cc
+++ b/src/osd/osd_types.cc
@@ -3140,7 +3140,7 @@ bool pg_interval_t::check_new_interval(
 	num_acting >= old_pg_pool.min_size &&
         (*could_have_gone_active)(old_acting_shards)) {
       if (out)
-	*out << "generate_past_intervals " << i
+	*out << __func__ << " " << i
 	     << ": not rw,"
 	     << " up_thru " << lastmap->get_up_thru(i.primary)
 	     << " up_from " << lastmap->get_up_from(i.primary)
@@ -3150,7 +3150,7 @@ bool pg_interval_t::check_new_interval(
 	  lastmap->get_up_from(i.primary) <= i.first) {
 	i.maybe_went_rw = true;
 	if (out)
-	  *out << "generate_past_intervals " << i
+	  *out << __func__ << " " << i
 	       << " : primary up " << lastmap->get_up_from(i.primary)
 	       << "-" << lastmap->get_up_thru(i.primary)
 	       << " includes interval"
@@ -3166,14 +3166,14 @@ bool pg_interval_t::check_new_interval(
 	// last_epoch_clean timing.
 	i.maybe_went_rw = true;
 	if (out)
-	  *out << "generate_past_intervals " << i
+	  *out << __func__ << " " << i
 	       << " : includes last_epoch_clean " << last_epoch_clean
 	       << " and presumed to have been rw"
 	       << std::endl;
       } else {
 	i.maybe_went_rw = false;
 	if (out)
-	  *out << "generate_past_intervals " << i
+	  *out << __func__ << " " << i
 	       << " : primary up " << lastmap->get_up_from(i.primary)
 	       << "-" << lastmap->get_up_thru(i.primary)
 	       << " does not include interval"
@@ -3182,7 +3182,7 @@ bool pg_interval_t::check_new_interval(
     } else {
       i.maybe_went_rw = false;
       if (out)
-	*out << "generate_past_intervals " << i << " : acting set is too small" << std::endl;
+	*out << __func__ << " " << i << " : acting set is too small" << std::endl;
     }
     return true;
   } else {