From: Ronen Friedman <rfriedma@redhat.com>
Date: Thu, 24 Mar 2022 07:29:26 +0000 (+0000)
Subject: osd/scrub: ignoring unsolicited DigestUpdate events
X-Git-Tag: v17.2.1~91^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F45595%2Fhead;p=ceph.git

osd/scrub: ignoring unsolicited DigestUpdate events

Manual fix to the cherry-picking of PR#44050.
The two lines here are esential part of the fix,
but were not part of the cherry-picked 84fe362
(they were "mis-cataloged" in a previous PR)

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

diff --git a/src/osd/scrubber/scrub_machine.h b/src/osd/scrubber/scrub_machine.h
index d9132eedca8..41669138a9c 100644
--- a/src/osd/scrubber/scrub_machine.h
+++ b/src/osd/scrubber/scrub_machine.h
@@ -299,11 +299,11 @@ struct WaitReplicas : sc::state<WaitReplicas, ActiveScrubbing> {
   using reactions =
     mpl::list<sc::custom_reaction<GotReplicas>,	 // all replicas are accounted for
 	      sc::transition<MapsCompared, WaitDigestUpdate>,
-	      sc::deferral<DigestUpdate>  // might arrive before we've reached WDU
+	      sc::custom_reaction<DigestUpdate>
 	      >;
 
   sc::result react(const GotReplicas&);
-
+  sc::result react(const DigestUpdate&);
   bool all_maps_already_called{false};	// see comment in react code
 };