Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix race condition in batch logic #56273 #60256

Closed
wants to merge 4 commits into from

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented May 26, 2021

What does this PR do?

Fix race condition in batch logic by letting the event subscriber to keep listening between batch iterations.

What issues does this PR fix or reference?

Fixes: #56273

Previous Behavior

After batches LocalClient would close the event subscriber purging events that could potentially be needed other batches.

Merge requirements satisfied?

[NOTICE] Bug fixes or features added to Salt require tests.

@dwoz dwoz requested a review from a team as a code owner May 26, 2021 01:06
@dwoz dwoz requested review from twangboy and removed request for a team May 26, 2021 01:06
@dwoz dwoz force-pushed the issue/master/56273 branch 2 times, most recently from 77ee859 to 62b4f53 Compare May 26, 2021 04:27
@dwoz dwoz changed the title [WIP] Fix race condition in batch logic #56273 Fix race condition in batch logic #56273 May 26, 2021
@sagetherage sagetherage added Aluminium Release Post Mg and Pre Si point-release minor release labels May 27, 2021
cmcmarrow
cmcmarrow previously approved these changes May 27, 2021
salt/client/__init__.py Show resolved Hide resolved
salt/client/__init__.py Show resolved Hide resolved
@Ch3LL Ch3LL mentioned this pull request Jun 4, 2021
garethgreenaway
garethgreenaway previously approved these changes Jun 4, 2021
changelog/56273.fixed Outdated Show resolved Hide resolved
@dwoz
Copy link
Contributor Author

dwoz commented Jun 18, 2021

re-run all

@dwoz dwoz requested a review from waynew June 18, 2021 21:44
@dwoz
Copy link
Contributor Author

dwoz commented Jun 19, 2021

These changes were put in 3003.1 (#60310) and will be merged into master with #60396

@dwoz dwoz closed this Jun 19, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Aluminium Release Post Mg and Pre Si point-release minor release
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Salt minion sometime return empty ret dict and it fails if failhard set to True
7 participants