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

[Issue 662] Fix race in connection.go waitUntilReady() #663

Merged
merged 3 commits into from
Nov 11, 2021
Merged

[Issue 662] Fix race in connection.go waitUntilReady() #663

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e189cf4
Fix issue 662: race in connection.go waitUntilReady().
Nov 8, 2021
defbae0
c.Lock() is the same as c.cond.Lock(), because sync.NewCond takes a L…
Nov 9, 2021
c78f71d
Clarify comment.
Nov 9, 2021
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
7 changes: 5 additions & 2 deletions pulsar/internal/connection.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,8 +327,8 @@ func (c *connection) doHandshake() bool {
}

func (c *connection) waitUntilReady() error {
c.Lock()
defer c.Unlock()
c.cond.L.Lock()
Copy link
Contributor

Choose a reason for hiding this comment

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

Curious what's the difference between doing c.Lock() vs c.cond.L.Lock()? Same for the changeState function? From looking at the code they should share the same lock?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

They're two different mutexes. See #663 (comment) for an explanation.

Copy link
Contributor Author

@bschofield bschofield Nov 9, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I agree that waitUntilReady() and changeState() should share the same lock.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Nope, I was wrong! See #663 (comment) which proves that c.Lock() and c.cond.L.Lock() are the same thing.

defer c.cond.L.Unlock()

for c.getState() != connectionReady {
c.log.Debugf("Wait until connection is ready state=%s", c.getState().String())
Expand Down Expand Up @@ -894,6 +894,9 @@ func (c *connection) Close() {
}

func (c *connection) changeState(state connectionState) {
c.cond.L.Lock()
defer c.cond.L.Unlock()

c.setState(state)
c.cond.Broadcast()
}
Expand Down