Skip to content

fix(client): risk of resource leak and closing closed channel #208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 25, 2025

Conversation

cryo-zd
Copy link
Contributor

@cryo-zd cryo-zd commented Apr 25, 2025

Changes:

  1. refactor func StdIo.SendRequest() to remove the potential risk of resource leak whose situation and boundary cases are similar to and have been discussed in pull request fix(client): resource leak in SSEClient.SendRequest()  #206
  2. fix the potential risk of panic: close of closed channel when we call func StdIo.Close() for more than one times. That is, we had better check whether the channel c.done in Client StdIo have been closed or not before we execute close(c.done)

Summary by CodeRabbit

  • Bug Fixes

    • Improved resource cleanup to prevent potential leaks during request handling and cancellation.
    • Enhanced robustness by avoiding duplicate close operations.
  • Chores

    • Added clarifying comments regarding request cancellation behavior.

Copy link
Contributor

coderabbitai bot commented Apr 25, 2025

Walkthrough

This change updates the client/transport/stdio.go file by refining the resource management in the Close and SendRequest methods. The Close method now checks if the done channel is already closed to avoid duplicate operations. In SendRequest, request marshaling is performed before registering the response channel, and a new helper function ensures proper cleanup of response channels from the internal map in all error and cancellation scenarios. These adjustments enhance the reliability of resource cleanup without altering any exported method signatures.

Changes

Files Changed Change Summary
client/transport/stdio.go Refined Close to prevent duplicate closure, reordered operations in SendRequest, and added cleanup helper.

Possibly related PRs


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 10efb82 and bcab98b.

📒 Files selected for processing (1)
  • client/transport/stdio.go (2 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
  • client/transport/stdio.go
✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 0

🧹 Nitpick comments (1)
client/transport/stdio.go (1)

103-109: Good improvement to prevent panic on repeated Close() calls.

The added check ensures that attempting to close an already closed channel won't cause a panic. This makes the method idempotent and safer to call multiple times.

Note: There's a small typo in the comment - "in-clight" should be "in-flight".

-	// cancel all in-clight request
+	// cancel all in-flight requests
📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 354fe53 and 10efb82.

📒 Files selected for processing (1)
  • client/transport/stdio.go (2 hunks)
🧰 Additional context used
🧬 Code Graph Analysis (1)
client/transport/stdio.go (2)
client/transport/interface.go (1)
  • JSONRPCResponse (36-45)
testdata/mockstdio_server.go (1)
  • JSONRPCResponse (18-26)
🔇 Additional comments (3)
client/transport/stdio.go (3)

192-209: Excellent refactoring to prevent resource leaks.

This refactoring improves the SendRequest method in several ways:

  1. The request is now marshaled before registering the response channel
  2. The cleanup logic is centralized in a helper function
  3. Resource cleanup is properly handled in all error and cancellation scenarios

This change prevents potential resource leaks where response channels might remain in the map if:

  • Request marshaling fails
  • Writing to stdin fails
  • Context is cancelled before receiving a response

212-213: Good error handling with proper cleanup.

The addition of deleteResponseChan() call ensures the response channel is properly removed from the map when writing the request fails, preventing resource leaks.


217-219: Good context cancellation handling with proper cleanup.

The addition of deleteResponseChan() call ensures the response channel is properly removed from the map when the context is cancelled, preventing resource leaks.

@ezynda3 ezynda3 merged commit 031a230 into mark3labs:main Apr 25, 2025
2 checks passed
adlternative pushed a commit to adlternative/mcp-go that referenced this pull request May 20, 2025
…abs#208)

* fix resource leak in Client StdIo

* fix potential risk of closing closed channel
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.

2 participants