]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/scrub: late-arriving reservation grants are not an error 46873/head
authorRonen Friedman <rfriedma@redhat.com>
Mon, 27 Jun 2022 16:02:15 +0000 (16:02 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Tue, 28 Jun 2022 12:16:41 +0000 (12:16 +0000)
... 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.

src/osd/pg_scrubber.cc

index 59372e552fc2875d5ad1e51651c92db9fa752c12..9814845d6f063326fe1b1d194cfc4930bd7e253c 100644 (file)
@@ -1514,8 +1514,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;
   }
 }