matteominin opened a new pull request, #24587:
URL: https://github.com/apache/camel/pull/24587
# Description
`OpenAIEndpoint` kept its MCP tool state (`cachedMcpTools`, `toolClientMap`,
`returnDirectTools`, `toolToServerName`) in unsynchronized collections
shared by all
concurrent exchanges. With `mcpReconnect=true` (default),
`reconnectMcpServer` mutated
them in place while other exchanges read them — reachable in any
multi-threaded route
hitting an MCP transport error. Three failures, each fixed:
1. **Reader corruption** (`ConcurrentModificationException` / half-rebuilt
tool list) →
reconnect now publishes immutable snapshots (`List/Map/Set.copyOf`)
swapped via
`volatile` references; readers stay lock-free.
2. **Duplicate reconnect** (concurrent reconnects close each other's
clients, leak
transports) → serialized with a per-server `ReentrantLock` + re-check;
only the first
thread reconnects, old client closed once.
3. **Stale entries** (`returnDirectTools` / `toolToServerName` kept vanished
tools) →
pruned from all four collections on reconnect.
**Tests:** `OpenAIEndpointMcpReconnectConcurrencyTest`, one per issue. No
user-visible
change → no upgrade-guide entry.
This description was drafted by Claude Code
# Target
- [x] I checked that the commit is targeting the correct branch (Camel 4
uses the `main` branch)
# Tracking
- [x] If this is a large change, bug fix, or code improvement, I checked
there is a [JIRA issue](https://issues.apache.org/jira/browse/CAMEL) filed for
the change (usually before you start working on it).
<!--
# *Note*: trivial changes like, typos, minor documentation fixes and other
small items do not require a JIRA issue. In this case your pull request should
address just this issue, without pulling in other changes.
-->
# Apache Camel coding standards and style
- [x] I checked that each commit in the pull request has a meaningful
subject line and body.
<!--
If you're unsure, you can format the pull request title like `[CAMEL-XXX]
Fixes bug in camel-file component`, where you replace `CAMEL-XXX` with the
appropriate JIRA issue.
-->
- [x] I have run `mvn clean install -DskipTests` locally from root folder
and I have committed all auto-generated changes.
<!--
You can run the aforementioned command in your module so that the build
auto-formats your code. This will also be verified as part of the checks and
your PR may be rejected if if there are uncommited changes after running `mvn
clean install -DskipTests`.
You can learn more about the contribution guidelines at
https://github.com/apache/camel/blob/main/CONTRIBUTING.md
-->
# AI-assisted contributions
- [x] If this PR includes AI-generated code, commits have proper
co-authorship attribution (e.g., `Co-authored-by` trailers) and the PR
description identifies the AI tool used.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
