Commit c8ae043
committed
mcp(fix[_utils]): Add thread safety to server cache and fix invalidation
why: FastMCP runs sync tool functions in a thread pool via
`anyio.to_thread.run_sync()`. The compound check-then-act pattern in
`_get_server` (check `in`, access `[]`, possibly `del`) was not atomic,
allowing concurrent tool calls to hit a `KeyError` when one thread
deletes a dead server's cache entry between another thread's `in` check
and `[]` access.
Additionally, `_invalidate_server` did not resolve env vars
(`LIBTMUX_SOCKET`, `LIBTMUX_SOCKET_PATH`), so calling
`_invalidate_server(socket_name=None)` would search for `key[0] == None`
but the cache key created by `_get_server` used the resolved env var
value.
what:
- Add `threading.Lock` to protect `_server_cache` in both `_get_server`
and `_invalidate_server`
- Add env var resolution to `_invalidate_server` to match `_get_server`1 parent b793fec commit c8ae043
1 file changed
Lines changed: 30 additions & 19 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
10 | 10 | | |
11 | 11 | | |
12 | 12 | | |
| 13 | + | |
13 | 14 | | |
14 | 15 | | |
15 | 16 | | |
| |||
24 | 25 | | |
25 | 26 | | |
26 | 27 | | |
| 28 | + | |
27 | 29 | | |
28 | 30 | | |
29 | 31 | | |
| |||
52 | 54 | | |
53 | 55 | | |
54 | 56 | | |
55 | | - | |
56 | | - | |
57 | | - | |
58 | | - | |
| 57 | + | |
| 58 | + | |
| 59 | + | |
| 60 | + | |
| 61 | + | |
59 | 62 | | |
60 | | - | |
61 | | - | |
62 | | - | |
63 | | - | |
64 | | - | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
| 69 | + | |
| 70 | + | |
| 71 | + | |
69 | 72 | | |
70 | | - | |
| 73 | + | |
71 | 74 | | |
72 | 75 | | |
73 | 76 | | |
| |||
83 | 86 | | |
84 | 87 | | |
85 | 88 | | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
| 97 | + | |
| 98 | + | |
| 99 | + | |
| 100 | + | |
| 101 | + | |
91 | 102 | | |
92 | 103 | | |
93 | 104 | | |
| |||
0 commit comments