fix: make upstream lists thread-safe (#6857) - #7062
Open
juicewcode wants to merge 8 commits into
Open
juicewcode wants to merge 8 commits into
juicewcode wants to merge 8 commits into
Conversation
Use CopyOnWriteArrayList for healthy and unhealthy upstream collections so request threads can safely iterate while health-check threads update them. Add a regression test covering snapshot iteration and visibility of subsequent upstream updates.
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
One or more issues must be addressed before approval.
Get a fresh assessment by requesting another Copilot review.
Pull request overview
This PR improves concurrent access to gateway upstream lists during health checks.
Changes:
- Uses
CopyOnWriteArrayListfor upstream map values. - Adds iterator snapshot and update visibility regression coverage.
File summaries
| File | Description |
|---|---|
| shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/cache/UpstreamCacheManagerTest.java | Updated as part of this pull request. |
| shenyu-loadbalancer/src/main/java/org/apache/shenyu/loadbalancer/cache/UpstreamCheckTask.java | Updated as part of this pull request. |
Review details
Suppressed comments (1)
shenyu-loadbalancer/src/test/java/org/apache/shenyu/loadbalancer/cache/UpstreamCacheManagerTest.java:89
- This fixture leaves health checking enabled (the
Upstreambuilder defaults it totrue) while the singleton manager starts a scheduled health-check thread. The syntheticcopy-on-write-url:8080is not a reachable endpoint, so that thread can mark it unhealthy and remove it betweensubmitand the size assertion, making this regression test flaky. Disable health checking for this fixture so only the explicittriggerAddOnechanges the list.
final Upstream upstream = Upstream.builder().url("copy-on-write-url:8080").status(true).build();
- Files reviewed: 2/2 changed files
- Comments generated: 1
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+290
to
292
| List<Upstream> list = MapUtils.computeIfAbsent(map, selectorId, k -> new CopyOnWriteArrayList<>()); | ||
| if (!list.contains(upstream)) { | ||
| list.add(upstream); |
…ist-thread-safety
Return a per-request snapshot from findUpstreamListBySelectorId so index-based load balancers observe a stable list while health-check updates are in progress. Update the regression test to verify that existing snapshots remain unchanged and subsequent requests observe newly added upstreams.
Contributor
There was a problem hiding this comment.
🟡 Changes recommended
The regression test does not verify the internal copy-on-write collection or iterator guarantee described by the PR.
Get a fresh assessment by requesting another Copilot review.
Review details
- Files reviewed: 3/3 changed files
- Comments generated: 1
- Review effort level: Balanced
Comment on lines
+92
to
+98
| List<Upstream> snapshot = upstreamCacheManager.findUpstreamListBySelectorId(selectorId); | ||
| Upstream added = Upstream.builder().url("added-url:8080").status(true).build(); | ||
| getUpstreamCheckTask(upstreamCacheManager).triggerAddOne(selectorId, added); | ||
|
|
||
| Assertions.assertEquals(1, snapshot.size()); | ||
| Assertions.assertSame(upstream, snapshot.get(0)); | ||
| Assertions.assertEquals(2, upstreamCacheManager.findUpstreamListBySelectorId(selectorId).size()); |
Aias00
approved these changes
Sep 19, 2026
Aias00
left a comment
Aias00
left a comment
Contributor
There was a problem hiding this comment.
Approved as PMC (Aias00). Small, well-scoped fix with regression tests; green CI, mergeable. Reviewed the diff.
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
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 #6857
Summary
ArrayListinstances withCopyOnWriteArrayList.Test
CopyOnWriteArrayList.Make sure that:
./mvnw clean install -Dmaven.javadoc.skip=true.