Skip to content

Conversation

@NickLucche
Copy link
Collaborator

Rebasing and cleaning up @robertgshaw2-redhat work here #18096.

@github-actions
Copy link

👋 Hi! Thank you for contributing to the vLLM project.

💬 Join our developer Slack at https://slack.vllm.ai to discuss your PR in #pr-reviews, coordinate on features in #feat- channels, or join special interest groups in #sig- channels.

Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which starts running only a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of those by going to your fastcheck build on Buildkite UI (linked in the PR checks section) and unblock them. If you do not have permission to unblock, ping simon-mo or khluu to add you in our Buildkite org.

Once the PR is approved and ready to go, your PR reviewer(s) can run CI to test the changes comprehensively before merging.

To run CI, PR reviewers can either: Add ready label to the PR or enable auto-merge.

🚀

@mergify mergify bot added the v1 label Jun 17, 2025
Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Summary of Changes

Hello @NickLucche, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly enhances the robustness and clarity of request lifecycle management within the distributed KV cache system. My changes introduce explicit handling for request abortion and refine the process of freeing KV cache blocks, ensuring that resources are released only after all necessary distributed operations are complete. This work builds upon existing efforts to improve the stability of the vLLM distributed architecture.

Highlights

  • Request Abort Handling: I've implemented a robust mechanism to handle the abortion of requests within the distributed KV cache system. This ensures that resources are properly cleaned up even if a request is terminated prematurely, preventing potential memory leaks or stale states.
  • Explicit KV Block Lifecycle Management: The lifecycle of KV cache blocks has been made more explicit. Requests now transition through a pending_kv_free_req_ids state, ensuring that KV blocks are only freed after all distributed transfer operations (like sending blocks to another worker) are confirmed complete. This prevents double-free issues and ensures data consistency.
  • Refactored KV Connector Metadata: The NixlConnectorMetadata and NixlConnector have been refactored to explicitly track requests based on their state: those needing to be received, those needing to be sent, and those that have been aborted. This improves clarity and control over the distributed KV operations.
  • Enhanced Unit Testing: A new comprehensive unit test (test_abort) has been added to thoroughly validate the correct lifecycle behavior of aborted remote decode requests, covering various scenarios from prefill to final cleanup.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in issue comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist is currently in preview and may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments to provide feedback.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link
Contributor

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

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

Code Review

This pull request introduces mechanisms for handling request aborts and makes the lifecycle of remote decode requests more explicit, particularly concerning the freeing of KV cache blocks. The changes in the scheduler to manage pending_kv_free_req_ids and the KV connector's new abort_request method are significant improvements. The tests have been updated to cover these new scenarios. A minor type hint correction is suggested. Overall, the PR appears to enhance the robustness and clarity of the system.

Copy link
Contributor

Choose a reason for hiding this comment

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

medium

The type hint for _reqs_need_abort is set[int], but req_id is consistently a string throughout the codebase. This should be set[str] to match the type of req_id.

Suggested change
self._reqs_need_abort: set[int] = set()
self._reqs_need_abort: set[str] = set()

Comment on lines +896 to +898
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

The connector needs to handle aborts, so calling self.connector.abort_request(req_id) is a good addition here.

Copy link
Contributor

Choose a reason for hiding this comment

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

medium

Consider removing or updating this TODO comment, as the introduction of pending_kv_free_req_ids and the logic in _free_request and _update_from_kv_xfer_finished seem to address it.

Comment on lines +909 to +913
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

The current implementation calls connector.abort_request(req_id) and then proceeds to _free_request. In _free_request, _connector_finished will likely return delay_free_blocks=False because the status is FINISHED_ABORTED, leading to immediate block freeing via _free_blocks. This aligns with the comment "Since we have not yet cached the blocks in this state, we should be okay."

Comment on lines +931 to +935
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

The logic to conditionally free blocks immediately or add them to pending_kv_free_req_ids based on delay_free_blocks is clear.

Comment on lines +942 to +945
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

Refactoring _free_blocks to accept request_id instead of the Request object simplifies its responsibility.

Comment on lines +1062 to +1064
Copy link
Contributor

Choose a reason for hiding this comment

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

medium

This logic correctly handles the removal of req_id from pending_kv_free_req_ids and calls _free_blocks(req_id) when the KV transfer is finished.

@mergify
Copy link

mergify bot commented Jun 18, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @NickLucche.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Jun 18, 2025
robertgshaw2-redhat and others added 11 commits June 18, 2025 14:38
Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>

Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>
Co-authored-by: Woosuk Kwon <woosuk.kwon@berkeley.edu>

Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>

Signed-off-by: NickLucche <nlucches@redhat.com>
Co-authored-by: NickLucche <nlucches@redhat.com>

Signed-off-by: rshaw@neuralmagic.com <robertgshaw2@gmail.com>

Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: NickLucche <nlucches@redhat.com>
Signed-off-by: NickLucche <nlucches@redhat.com>
@mergify
Copy link

mergify bot commented Jun 25, 2025

This pull request has merge conflicts that must be resolved before it can be
merged. Please rebase the PR, @NickLucche.

https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/working-with-forks/syncing-a-fork

@mergify mergify bot added the needs-rebase label Jun 25, 2025
@NickLucche
Copy link
Collaborator Author

closing in favor of #20139

@NickLucche NickLucche closed this Jun 26, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants