Block Sends when Resend Request is active #715
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -230,6 +230,9 @@ func (state inSession) resendMessages(session *session, beginSeqNo, endSeqNo int | |||
| return state.generateSequenceReset(session, beginSeqNo, endSeqNo+1, inReplyTo) | |||
| } | |||
|
|
|||
| session.resendMutex.Lock() | |||
There was a problem hiding this comment.
Please place a comment indicating that this lock must always be locked first before the sendMutex, otherwise there is potential for a deadlock, and that mutex is locked within the session.EnqueueBytesAndSend method below
| @@ -302,6 +303,9 @@ func (s *session) sendInReplyTo(msg *Message, inReplyTo *Message) error { | |||
| return s.queueForSend(msg) | |||
| } | |||
|
|
|||
| s.resendMutex.RLock() | |||
There was a problem hiding this comment.
Mirror other comment here as well
| @@ -40,7 +40,8 @@ type session struct { | |||
| toSend [][]byte | |||
|
|
|||
| // Mutex for access to toSend. | |||
| sendMutex sync.Mutex | |||
| sendMutex sync.Mutex | |||
| resendMutex sync.RWMutex | |||
There was a problem hiding this comment.
Additional comment above this as well indicating the reason why this mutex exists in conjunction with the sendMutex and in which order they must be locked to avoid deadlocks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.