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.

Sign up for GitHub

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

Jump to bottom

fix #2376 - avoid deadlock scenario when completing dead connections #2378

Merged
merged 4 commits into from
Feb 20, 2023
Merged

fix #2376 - avoid deadlock scenario when completing dead connections #2378

merged 4 commits into from
Feb 20, 2023

Conversation

mgravell
Copy link
Collaborator

@mgravell mgravell commented Feb 20, 2023 •
edited
Loading

Deadlock scenario reported with one path (RecordConnectionFailed) taking queue then message locks, and another path (ExecuteSyncImpl) taking message then queue locks; change both paths to only take one lock at a time - never nested.

  1. in RecordConnectionFailed don't hold the queue lock when we abort things - only hold it when fetching next
  2. in ExecuteSyncImpl, don't hold the message lock when throwing for timeout
  3. to avoid similar not yet seen: in GetHeadMessages, don't blindly wait forever on the message lock

also standardise on TryPeek/TryDequeue

@mgravell
fix #2376
33c8536 
1. to fix the immediate scenario: don't hold the queue lock when we abort things - only hold it when fetching next
2. to avoid similar not yet seen: in GetHeadMessages, don't blindly wait forever

also standardise on TryPeek/TryDequeue
@mgravell mgravell requested a review from NickCraver February 20, 2023 13:59
@mgravell mgravell mentioned this pull request Feb 20, 2023
Closed
NickCraver
NickCraver approved these changes Feb 20, 2023
View reviewed changes
Copy link
Collaborator

@NickCraver NickCraver left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good 👍

@mgravell mgravell merged commit ab757f7 into main Feb 20, 2023
@mgravell mgravell deleted the i2376 branch February 20, 2023 14:45
@stanleysmall-microsoft stanleysmall-microsoft mentioned this pull request Feb 21, 2023
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@NickCraver NickCraver NickCraver approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@mgravell @NickCraver