Skip to content

Fix a possible deadlock in the log broker#3006

Merged
dperny merged 1 commit into
moby:masterfrom
dperny:fix-logbroker-deadlock
Jun 11, 2021
Merged

Fix a possible deadlock in the log broker#3006
dperny merged 1 commit into
moby:masterfrom
dperny:fix-logbroker-deadlock

Conversation

@dperny

@dperny dperny commented Jun 10, 2021

Copy link
Copy Markdown
Collaborator

Fixes a case where certain situations in the logbroker can create a deadlock. Fixes moby/moby#42314.

@xinfengliu, does this seem correct to you?

@xinfengliu

Copy link
Copy Markdown
Contributor

@dperny
Thanks. The code change looks good to me. The effect is just to move s.changed.Publish(s) out of the lock, everything else is unchanged and the lock is released at end of all code paths.

Fixes a case where certain situations in the logbroker can create a
deadlock. Fixes moby/moby#42314.

Signed-off-by: Drew Erny <[email protected]>
@dperny
dperny force-pushed the fix-logbroker-deadlock branch from dfa1571 to 21ba4a1 Compare June 11, 2021 16:33
@codecov

codecov Bot commented Jun 11, 2021

Copy link
Copy Markdown

Codecov Report

Merging #3006 (21ba4a1) into master (5a5494a) will decrease coverage by 0.09%.
The diff coverage is 75.00%.

@@            Coverage Diff             @@
##           master    #3006      +/-   ##
==========================================
- Coverage   60.88%   60.78%   -0.10%     
==========================================
  Files         142      142              
  Lines       20293    20296       +3     
==========================================
- Hits        12355    12337      -18     
- Misses       6474     6496      +22     
+ Partials     1464     1463       -1     

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Analysis of docker swarm "dispatcher is stopped"

2 participants