fix: protect against concurrent map access in APIServer #6388
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
In a past testdev run, the tests failed with:
fatal error: concurrent map read and map write
goroutine 569315 [running]:
github.com/dagger/dagger/core/schema.(*APIServer).ServeHTTP(0xc0197f3900, {0x1f9c9a0, 0xc0100aa460}, 0xc00eed5800)
/app/core/schema/schema.go:171 +0x119
github.com/dagger/dagger/engine/server.(*DaggerServer).ServeClientConn.(*DaggerServer).HTTPHandlerForClient.func4({0x1f9c9a0, 0xc0100aa460}, 0xc0348b3660?)
/app/engine/server/server.go:211 +0x219
net/http.HandlerFunc.ServeHTTP(0x410805?, {0x1f9c9a0?, 0xc0100aa460?}, 0xc0100aa401?)
/usr/local/go/src/net/http/server.go:2136 +0x29
net/http.serverHandler.ServeHTTP({0x1f912f8?}, {0x1f9c9a0?, 0xc0100aa460?}, 0x6?)
/usr/local/go/src/net/http/server.go:2938 +0x8e
net/http.(*conn).serve(0xc003f73b00, {0x1fa3018, 0xc034a38bd0})
/usr/local/go/src/net/http/server.go:2009 +0x5f4
created by net/http.(*Server).Serve in goroutine 568703
/usr/local/go/src/net/http/server.go:3086 +0x5cb
The map in question, `clientCallContext` is usually accessed behing the
`clientCallMu` lock. There were a few instances where reads of this map
were *not* behind this lock, so I've added these in.
Signed-off-by: Justin Chadwell <me@jedevc.com>
Signed-off-by: Justin Chadwell <me@jedevc.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 a potential concurrency issue introduced in #6167 - it looks like during the lock refactors, we missed a couple cases.
In a past testdev run (https://github.com/dagger/dagger/actions/runs/7459047868/job/20294230186), the tests failed with:
The map in question,
clientCallContextis usually accessed behing theclientCallMulock. There were a few instances where reads of this map were not behind this lock, so I've added these in.