From: Ronen Friedman <rfriedma@redhat.com>
Date: Thu, 17 Feb 2022 09:29:22 +0000 (+0000)
Subject: osd/scrub: stop sending bogus digest-update event messages
X-Git-Tag: v18.0.0~1354^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e1b5347b81d17c8a5a1f6e1d4d76d18977ec2b0c;p=ceph.git

osd/scrub: stop sending bogus digest-update event messages

A minimal change extracted from PR#44050, to facilitate
backporting.

The multitudes of bogus events generated fill up the logs.

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

diff --git a/src/osd/scrubber/PrimaryLogScrub.cc b/src/osd/scrubber/PrimaryLogScrub.cc
index 127f9fab56bd..2e895a04169c 100644
--- a/src/osd/scrubber/PrimaryLogScrub.cc
+++ b/src/osd/scrubber/PrimaryLogScrub.cc
@@ -87,9 +87,8 @@ void PrimaryLogScrub::submit_digest_fixes(const digests_fixes_t& fixes)
 
 
     ctx->register_on_success([this]() {
-      dout(20) << "updating scrub digest " << num_digest_updates_pending
-               << dendl;
-      if (--num_digest_updates_pending <= 0) {
+      if ((num_digest_updates_pending >= 1) &&
+          (--num_digest_updates_pending == 0)) {
         m_osds->queue_scrub_digest_update(m_pl_pg,
                                           m_pl_pg->is_scrub_blocking_ops());
       }