Fix tool not found in MCP memory issue (#3931) (#3932)

opensearch-trigger-bot[bot] · zane-neo · web-flow · commit 06e20ac201f8 · 2025-06-20T15:57:07.000+08:00
(cherry picked from commit 782e97d) Signed-off-by: zane-neo <zaniu@amazon.com> Co-authored-by: zane-neo <zaniu@amazon.com>
diff --git a/plugin/src/main/java/org/opensearch/ml/action/mcpserver/TransportMcpToolsRemoveOnNodesAction.java b/plugin/src/main/java/org/opensearch/ml/action/mcpserver/TransportMcpToolsRemoveOnNodesAction.java
@@ -112,7 +112,7 @@ private MLMcpToolsRemoveNodeResponse removeMcpTools(List<String> tools) {
                         );
                     errors.get().add(toolName);
                     return Mono.empty();
-                }).subscribe();
+                }).doOnSuccess(x -> McpAsyncServerHolder.IN_MEMORY_MCP_TOOLS.remove(toolName)).subscribe();
             }
             return Mono.empty();
         }).doOnComplete(() -> log.debug("Successfully removed tools on node: {}", clusterService.localNode().getId())).subscribe();

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ private MLMcpToolsRemoveNodeResponse removeMcpTools(List<String> tools) {`
`112`	`112`	`);`
`113`	`113`	`errors.get().add(toolName);`
`114`	`114`	`return Mono.empty();`
`115`		`- }).subscribe();`
	`115`	`+ }).doOnSuccess(x -> McpAsyncServerHolder.IN_MEMORY_MCP_TOOLS.remove(toolName)).subscribe();`
`116`	`116`	`}`
`117`	`117`	`return Mono.empty();`
`118`	`118`	`}).doOnComplete(() -> log.debug("Successfully removed tools on node: {}", clusterService.localNode().getId())).subscribe();`