update:添加锁保护避免MCP并发初始化时的竞态条件

This commit is contained in:
3030332422
2025-12-22 15:56:40 +08:00
parent 6c57ce9dd2
commit 85f5404b3b
@@ -33,6 +33,7 @@ class ServerMCPManager:
)
self.clients: Dict[str, ServerMCPClient] = {}
self.tools = []
self._init_lock = asyncio.Lock()
def load_config(self) -> Dict[str, Any]:
"""加载MCP服务配置"""
@@ -58,6 +59,9 @@ class ServerMCPManager:
client = ServerMCPClient(srv_config)
# 设置超时时间5秒
await asyncio.wait_for(client.initialize(logging_callback=self.logging_callback), timeout=5)
# 使用锁保护共享状态的修改
async with self._init_lock:
self.clients[name] = client
client_tools = client.get_available_tools()
self.tools.extend(client_tools)
@@ -89,7 +93,7 @@ class ServerMCPManager:
tasks.append(self._init_server(name, srv_config))
if tasks:
await asyncio.gather(*tasks, return_exceptions=True)
await asyncio.gather(*tasks)
# 输出当前支持的服务端MCP工具列表
if hasattr(self.conn, "func_handler") and self.conn.func_handler: