From: Ronen Friedman <rfriedma@redhat.com>
Date: Thu, 3 Dec 2020 15:05:50 +0000 (+0200)
Subject: osd: restoring a log message required by osd-scrub-test.sh
X-Git-Tag: v16.1.0~270^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0ac87ebb9733cd878003fea0936b6da9bba65ee1;p=ceph.git

osd: restoring a log message required by osd-scrub-test.sh

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
---

diff --git a/src/osd/pg_scrubber.cc b/src/osd/pg_scrubber.cc
index 8894106dca0..a558e0e8857 100644
--- a/src/osd/pg_scrubber.cc
+++ b/src/osd/pg_scrubber.cc
@@ -181,7 +181,7 @@ bool PgScrubber::verify_against_abort(epoch_t epoch_to_verify)
   }
 
   dout(15) << __func__ << " aborting. incoming epoch: " << epoch_to_verify
-	   << "vs last-aborted: " << m_last_aborted << dendl;
+	   << " vs last-aborted: " << m_last_aborted << dendl;
 
   // if we were not aware of the abort before - kill the scrub.
   if (epoch_to_verify > m_last_aborted) {
@@ -699,6 +699,9 @@ void PgScrubber::add_delayed_scheduling()
     m_needs_sleep = false;
     m_sleep_started_at = ceph_clock_now();
 
+    // the following log line is used by osd-scrub-test.sh
+    dout(20) << __func__ << " scrub state is PendingTimer, sleeping" << dendl;
+
     // the 'delayer' for crimson is different. Will be factored out.
 
     spg_t pgid = m_pg->get_pgid();
@@ -1047,17 +1050,17 @@ int PgScrubber::build_scrub_map_chunk(
     int r = m_pg->get_pgbackend()->be_scan_list(map, pos);
     dout(10) << __func__ << " be r " << r << dendl;
     if (r == -EINPROGRESS) {
-      dout(8 /*20*/) << __func__ << " in progress" << dendl;
+      dout(20) << __func__ << " in progress" << dendl;
       return r;
     }
   }
 
   // finish
-  dout(8 /*20*/) << __func__ << " finishing" << dendl;
+  dout(20) << __func__ << " finishing" << dendl;
   ceph_assert(pos.done());
   m_pg->_repair_oinfo_oid(map);
 
-  dout(8 /*20*/) << __func__ << " done, got " << map.objects.size() << " items" << dendl;
+  dout(20) << __func__ << " done, got " << map.objects.size() << " items" << dendl;
   return 0;
 }
 
@@ -1649,10 +1652,9 @@ void PgScrubber::scrub_finish()
 	  stats.stats.sum.num_large_omap_objects = m_omap_stats.large_omap_objects;
 	  stats.stats.sum.num_omap_bytes = m_omap_stats.omap_bytes;
 	  stats.stats.sum.num_omap_keys = m_omap_stats.omap_keys;
-	  dout(10 /*25*/) << "scrub_finish shard " << m_pg_whoami
-			  << " num_omap_bytes = " << stats.stats.sum.num_omap_bytes
-			  << " num_omap_keys = " << stats.stats.sum.num_omap_keys
-			  << dendl;
+	  dout(25) << "scrub_finish shard " << m_pg_whoami
+		   << " num_omap_bytes = " << stats.stats.sum.num_omap_bytes
+		   << " num_omap_keys = " << stats.stats.sum.num_omap_keys << dendl;
 	} else {
 	  stats.stats.sum.num_shallow_scrub_errors = m_shallow_errors;
 	  // XXX: last_clean_scrub_stamp doesn't mean the pg is not inconsistent
@@ -2222,4 +2224,4 @@ ostream& operator<<(ostream& out, const MapsCollectionStatus& sf)
   return out << " ] ";
 }
 
-}  // namespace Scrub
\ No newline at end of file
+}  // namespace Scrub