Skip to content

MCP: close the command context when a tool call ends - #2645

Open
erichare wants to merge 4 commits into
fix/mcp-update-wire-schemafrom
fix/mcp-request-context-cleanup
Open

erichare wants to merge 4 commits into
fix/mcp-update-wire-schemafrom
fix/mcp-request-context-cleanup

Conversation

@erichare

@erichare erichare commented Oct 13, 2026 •

Copy link
Copy Markdown
Contributor

What this PR does:

Closes each MCP command context when a tool call succeeds, fails, or is canceled, including synchronous processor failures. Keyspace tools reuse one request context, and cleanup failures preserve the original result or error.

This builds on #2651.

Which issue(s) this PR fixes:

Part of #2629. The remaining trace-context audit keeps that issue open.

Verification

McpResourceTest: 9 tests run, 0 failures, 0 errors, 0 skipped; BUILD SUCCESS. The same invocation checked formatting for 1,196 files with 0 non-complying.

JAVA_HOME=/Library/Java/JavaVirtualMachines/graalvm-21.jdk/Contents/Home ./mvnw -B -ntp test -Dtest=McpResourceTest -DskipITs -Dxml-format.skip=true

Integration tests and manual client checks were not run in this cleanup.

Checklist

  • Changes manually tested
  • Automated Tests added/updated
  • Documentation added/updated
  • CLA Signed: DataStax CLA

@erichare
erichare requested a review from a team as a code owner October 13, 2026 21:15
@erichare
erichare changed the base branch from fix/mcp-protocol-foundation to fix/mcp-update-wire-schema October 22, 2026 18:19
@erichare erichare mentioned this pull request Oct 22, 2026
3 of 4 tasks
@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

📈 Unit Test Coverage Delta vs Main Branch

Metric Value
Main Branch 55.07%
This PR 55.34%
Delta 🟢 +0.27%
✅ Coverage improved!

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

Unit Test Coverage Report

Overall Project 55.34% 🍏
Files changed 100% 🍏

File Coverage
McpResource.java 50.32% 🍏

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

📈 Integration Test Coverage Delta vs Main Branch (dse69-it)

Metric Value
Main Branch 73.04%
This PR 73.04%
Delta 🟢 +0.00%
✅ Coverage improved!

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

Integration Test Coverage Report (dse69-it)

Overall Project 73.04% -0.01% 🍏
Files changed 77.42% 🍏

File Coverage
McpResource.java 86.17% -2.25% 🍏

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

📉 Integration Test Coverage Delta vs Main Branch (hcd-it)

Metric Value
Main Branch 74.35%
This PR 74.35%
Delta 🔴 -0.00%
⚠️ Coverage decreased

@github-actions

github-actions Bot commented Oct 22, 2026 •

Copy link
Copy Markdown
Contributor

Integration Test Coverage Report (hcd-it)

Overall Project 74.35% -0.01% 🍏
Files changed 77.42% 🍏

File Coverage
McpResource.java 86.17% -2.25% 🍏

@erichare
erichare force-pushed the fix/mcp-request-context-cleanup branch from f8b0f28 to cca3d08 Compare October 24, 2026 00:36
@erichare
erichare removed this pull request from stack #2660 October 27, 2026 23:11
@erichare
erichare added this pull request to stack #2667 October 27, 2026 23:12

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant