From ebbb82f7eb528f1884fab63246e996956b66e5c2 Mon Sep 17 00:00:00 2001 From: Ronen Friedman Date: Thu, 24 Mar 2022 07:29:26 +0000 Subject: [PATCH] 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 --- src/osd/scrubber/scrub_machine.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 { using reactions = mpl::list, // all replicas are accounted for sc::transition, - sc::deferral // might arrive before we've reached WDU + sc::custom_reaction >; sc::result react(const GotReplicas&); - + sc::result react(const DigestUpdate&); bool all_maps_already_called{false}; // see comment in react code }; -- 2.47.3