xds/client: hold authority mutex before making a new authority #5331
+6
−4
Conversation
This file contains 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
dfawley
approved these changes
Apr 29, 2022
xds/internal/xdsclient/loadreport.go
Outdated
| @@ -28,7 +28,9 @@ import ( | |||
| // It returns a Store for the user to report loads, a function to cancel the | |||
| // load reporting stream. | |||
| func (c *clientImpl) ReportLoad(server *bootstrap.ServerConfig) (*load.Store, func()) { | |||
| c.authorityMu.Lock() | |||
| a, err := c.newAuthority(server) | |||
There was a problem hiding this comment.
Should we name the function newAuthorityLocked to better indicate you should have the lock when calling it? I see it's in the doc comments but those obviously weren't sufficient in this case.
There was a problem hiding this comment.
Done. Rename this and several other methods.
menghanl
force-pushed
the
xds_client_lock
branch
from
c33c665 to
a428cd3
Compare
dfawley
reviewed
Apr 29, 2022
xds/internal/xdsclient/loadreport.go
Outdated
| @@ -38,6 +40,6 @@ func (c *clientImpl) ReportLoad(server *bootstrap.ServerConfig) (*load.Store, fu | |||
| store, cancelF := a.reportLoad() | |||
| return store, func() { | |||
| cancelF() | |||
| c.unrefAuthority(a) | |||
| c.unrefAuthorityLocked(a) | |||
There was a problem hiding this comment.
Is this cleanup function always invoked with the lock held?
xds/internal/xdsclient/watchers.go
Outdated
| @@ -28,7 +28,7 @@ import ( | |||
| // after the watcher is canceled. The caller needs to handle this case. | |||
| func (c *clientImpl) WatchListener(serviceName string, cb func(xdsresource.ListenerUpdate, error)) (cancel func()) { | |||
| n := xdsresource.ParseName(serviceName) | |||
| a, unref, err := c.findAuthority(n) | |||
| a, unref, err := c.findAuthorityLocked(n) | |||
There was a problem hiding this comment.
Ohh, the other two actually says must not hold mu.....
menghanl
force-pushed
the
xds_client_lock
branch
from
8a36f55 to
900c8ef
Compare
dfawley
approved these changes
Apr 29, 2022
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
fixes #5328
Caller must hold the mutex before calling
newAuthority.RELEASE NOTES: