fix: data race in host infrastructure proxy context map #7176
Conversation
This file contains hidden or 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
Codecov Report❌ Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## main #7176 +/- ##
==========================================
+ Coverage 71.10% 71.12% +0.01%
==========================================
Files 228 228
Lines 40678 40686 +8
==========================================
+ Hits 28926 28937 +11
+ Misses 10059 10054 -5
- Partials 1693 1695 +2 ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
codefromthecrypt
force-pushed
the
fix/proxy-context-map-race
branch
from
ef4c378 to
415abb5
Compare
jukie
reviewed
Oct 9, 2025
codefromthecrypt
force-pushed
the
fix/proxy-context-map-race
branch
from
dab5d78 to
c73790d
Compare
|
Code LGTM and if you fix the linting/import issues I'll approve |
|
weird no idea why this closed.. sorry about that. |
zirain
force-pushed
the
fix/proxy-context-map-race
branch
from
0678aae to
02aeb1a
Compare
jukie
previously approved these changes
Oct 11, 2025
zirain
previously approved these changes
Oct 11, 2025
|
@codefromthecrypt thanks for adding this. Could you please add more test coverage to make the bots happy? |
This commit fixes a data race in the host infrastructure where proxyContextMap was being accessed concurrently without synchronization. The race occurred between: - runEnvoy() writing to the map (line 92) - Close() reading from the map (line 37) - stopEnvoy() reading and deleting from the map (lines 125, 129) Added a sync.RWMutex to protect all accesses to proxyContextMap: - Use RLock for reads in Close() and CreateOrUpdateProxyInfra() - Use Lock for writes in runEnvoy() and stopEnvoy() - Extract map keys before iteration in Close() to avoid holding the lock while calling stopEnvoy() This ensures thread-safe access to the proxy context map during concurrent infrastructure operations. Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
Signed-off-by: Adrian Cole <[email protected]>
|
ok sure.. will add more coverage |
Signed-off-by: Adrian Cole <[email protected]>
codefromthecrypt
force-pushed
the
fix/proxy-context-map-race
branch
from
c28e20b to
8bbb4f1
Compare
|
at least locally coverage is good now. 🤞 |
|
/retest |
|
Looks like the new tests are failing @codefromthecrypt |
|
I'll close this and re-open it after #7225 is merged because the /tmp tech debt is haunting |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
What this PR does / why we need it:
This commit fixes a data race in the host infrastructure where proxyContextMap was being accessed concurrently without synchronization.
The race occurred between:
Which issue(s) this PR fixes:
Race found in envoyproxy/ai-gateway#1314