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.

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

Fix deadlock in managed tp's updateStatus #700

Merged
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions pkg/transport/managed_transport.go
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,10 @@ func (mt *ManagedTransport) updateStatus(isUp bool, tries int) (err error) {
}()

mt.isUpMux.Lock()
defer mt.isUpMux.Unlock()

// If last update is the same as current, nothing needs to be done.
if mt.isUp == isUp {
mt.isUpMux.Unlock()
return nil
}

Expand Down Expand Up @@ -515,7 +515,6 @@ func (mt *ManagedTransport) updateStatus(isUp bool, tries int) (err error) {

mt.isUp = isUp
mt.isUpErr = err
mt.isUpMux.Unlock()
return err
}

Expand Down