From: Ronen Friedman <rfriedma@redhat.com>
Date: Mon, 27 Jun 2022 16:02:15 +0000 (+0000)
Subject: osd/scrub: late-arriving reservation grants are not an error
X-Git-Tag: v17.2.4~173^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F46872%2Fhead;p=ceph.git

osd/scrub: late-arriving reservation grants are not an error

... as, barring a bug, these are simply the successful grants
received after one replica had failed to secure the required
resources.

Fixes: https://tracker.ceph.com/issues/56400

Signed-off-by: Ronen Friedman <rfriedma@redhat.com>
(cherry picked from commit 141bce2929ef057e3ec80b3823de95ceedf62b7d)

Conflicts:
	src/osd/scrubber/pg_scrubber.cc

No real conflict. Solved by selecting the changed line.
---

diff --git a/src/osd/scrubber/pg_scrubber.cc b/src/osd/scrubber/pg_scrubber.cc
index 25e4a83d9e8..17b120012b0 100644
--- a/src/osd/scrubber/pg_scrubber.cc
+++ b/src/osd/scrubber/pg_scrubber.cc
@@ -1619,8 +1619,8 @@ void PgScrubber::handle_scrub_reserve_grant(OpRequestRef op, pg_shard_t from)
   if (m_reservations.has_value()) {
     m_reservations->handle_reserve_grant(op, from);
   } else {
-    derr << __func__ << ": received unsolicited reservation grant from osd " << from
-	 << " (" << op << ")" << dendl;
+    dout(20) << __func__ << ": late/unsolicited reservation grant from osd "
+	 << from << " (" << op << ")" << dendl;
   }
 }