]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/scrub: ignoring unsolicited DigestUpdate events 45595/head
authorRonen Friedman <rfriedma@redhat.com>
Thu, 24 Mar 2022 07:29:26 +0000 (07:29 +0000)
committerRonen Friedman <rfriedma@redhat.com>
Thu, 24 Mar 2022 07:29:26 +0000 (07:29 +0000)
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>
src/osd/scrubber/scrub_machine.h

index d9132eedca8581ada060f917cc491160c6667ba1..41669138a9cc2fb6dedc0a343439014537092629 100644 (file)
@@ -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
 };