Skip to content

Commit

Permalink
Merge pull request #1210 from arkhipov/master
Browse files Browse the repository at this point in the history
fix: re-send cancel message on coordination session re-attach
  • Loading branch information
asmyasnikov authored Apr 21, 2024
2 parents e0a1158 + 8d5b7bd commit 9293016
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
* Fixed the hanging semaphore issue on coordination session reconnect

## v3.65.3
* Fixed data race in `internal/conn.grpcClientStream`

Expand Down
7 changes: 6 additions & 1 deletion internal/coordination/conversation/conversation.go
Original file line number Diff line number Diff line change
Expand Up @@ -424,7 +424,12 @@ func (c *Controller) OnAttach() {
delete(c.conflicts, req.conflictKey)
}

req.requestSent = nil
// If the request has been canceled, re-send the cancellation message, otherwise re-send the original one.
if req.canceled {
req.cancelRequestSent = nil
} else {
req.requestSent = nil
}
notify = true
}
}
Expand Down

0 comments on commit 9293016

Please sign in to comment.