osd/scrub: minor log changes

mostly related to the replica scrub interactions.

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

diff --git a/src/osd/scrubber/PrimaryLogScrub.cc b/src/osd/scrubber/PrimaryLogScrub.cc
index 8a969e521381dcf703f526b270fc832224c9288e..74661ab12eeb77f3e0a7e9f018c09566039234f0 100644 (file)
--- a/src/osd/scrubber/PrimaryLogScrub.cc
+++ b/src/osd/scrubber/PrimaryLogScrub.cc
@@ -63,6 +63,10 @@ void PrimaryLogScrub::submit_digest_fixes(const digests_fixes_t& fixes)
       num_digest_updates_pending--;
       continue;
     }
+    dout(15) << fmt::format(
+                 "{}: {}, pg[{}] {}/{}", __func__, num_digest_updates_pending,
+                 m_pg_id, obj, dgs)
+            << dendl;
     if (obc->obs.oi.soid != obj) {
       m_osds->clog->error()
        << m_pg_id << " " << m_mode_desc << " " << obj

diff --git a/src/osd/scrubber/osd_scrub_sched.cc b/src/osd/scrubber/osd_scrub_sched.cc
index d451e44ecc3181258cd8b45a75c4fd205084f463..82b7c689d4cd45568567a5193503f70f4dabdd3f 100644 (file)
--- a/src/osd/scrubber/osd_scrub_sched.cc
+++ b/src/osd/scrubber/osd_scrub_sched.cc
@@ -513,7 +513,7 @@ Scrub::schedule_result_t ScrubQueue::select_from_group(
     }
   }
 
-  dout(20) << " returning 'none ready' " << dendl;
+  dout(20) << " returning 'none ready'" << dendl;
   return Scrub::schedule_result_t::none_ready;
 }
 

diff --git a/src/osd/scrubber/scrub_backend.cc b/src/osd/scrubber/scrub_backend.cc
index e12eb106d14d7e883166bc670043e247f36e0b21..10adbe2c56e261b0b99fd1eb97408fe115acc3bd 100644 (file)
--- a/src/osd/scrubber/scrub_backend.cc
+++ b/src/osd/scrubber/scrub_backend.cc
@@ -1062,17 +1062,25 @@ ScrubBackend::auth_and_obj_errs_t ScrubBackend::match_in_shards(
                                                      ho.has_snapset());
 
       dout(20) << fmt::format(
-                    "{}: {} {} {} shards: {} {} {}",
-                    __func__,
-                    (m_repair ? " repair " : " "),
-                    (m_is_replicated ? "replicated " : ""),
-                    (srd == auth_sel.auth_shard ? "auth" : ""),
-                    auth_sel.shard_map.size(),
-                    (auth_sel.digest_match ? " digest_match " : " "),
-                    (auth_sel.shard_map[srd].only_data_digest_mismatch_info()
-                       ? "'info mismatch info'"
-                       : ""))
-               << dendl;
+                   "{}: {}{} <{}:{}> shards: {} {} {}", __func__,
+                   (m_repair ? "repair " : ""),
+                   (m_is_replicated ? "replicated " : ""), srd,
+                   (srd == auth_sel.auth_shard ? "auth" : "-"),
+                   auth_sel.shard_map.size(),
+                   (auth_sel.digest_match ? " digest_match " : " "),
+                   (auth_sel.shard_map[srd].only_data_digest_mismatch_info()
+                      ? "'info mismatch info'"
+                      : ""))
+              << dendl;
+      if (discrep_found) {
+       dout(10) << fmt::format(
+                     "{}: <{}> auth:{} ({}/{}) vs {} ({}/{}) {}", __func__, ho,
+                     auth_sel.auth_shard, auth_object.omap_digest_present,
+                     auth_object.omap_digest, srd,
+                     smap.objects[ho].omap_digest_present ? true : false,
+                     smap.objects[ho].omap_digest, ss.str())
+                << dendl;
+      }
 
       // If all replicas match, but they don't match object_info we can
       // repair it by using missing_digest mechanism