Skip to content

feat: fix deadlock in Commit #3191 #3193

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

feat: fix deadlock in Commit #3191 #3193

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4fd4b73
feat: fix deadlock in Commit #3191
dominicqi Jun 13, 2025
cb3f8ee
feat: fix deadlock in Commit #3191
dominicqi Jun 20, 2025
700a6e5
Merge branch 'main' into fix_deadlock
dominicqi Jun 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions offset_manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,16 +257,11 @@ func (om *offsetManager) flushToBroker() {
return
}

// Care needs to be taken to unlock this. Don't want to defer the unlock as this would
// cause the lock to be held while waiting for the broker to reply.
broker.lock.Lock()
req := om.constructRequest()
if req == nil {
broker.lock.Unlock()
return
}
resp, rp, err := sendOffsetCommit(broker, req)
broker.lock.Unlock()

if err != nil {
om.handleError(err)
Expand All @@ -290,6 +285,10 @@ func (om *offsetManager) flushToBroker() {
func sendOffsetCommit(coordinator *Broker, req *OffsetCommitRequest) (*OffsetCommitResponse, *responsePromise, error) {
resp := new(OffsetCommitResponse)
responseHeaderVersion := resp.headerVersion()

coordinator.lock.Lock()
defer coordinator.lock.Unlock()

promise, err := coordinator.send(req, true, responseHeaderVersion)
if err != nil {
return nil, nil, err
Expand Down