-
Notifications
You must be signed in to change notification settings - Fork 3.7k
[vllm, rollout] feat: support reset prefix cache after abort #4519
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
+12
−2
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -522,7 +522,7 @@ async def clear_kv_cache(self): | |
| async def wait_for_requests_to_drain(self): | ||
| await self.engine.wait_for_requests_to_drain() | ||
|
|
||
| async def abort_all_requests(self) -> dict[str, Any]: | ||
| async def abort_all_requests(self, reset_prefix_cache: bool = True) -> dict[str, Any]: | ||
| """Abort all ongoing generation requests. | ||
|
|
||
| Returns: | ||
|
|
@@ -552,14 +552,19 @@ async def abort_all_requests(self) -> dict[str, Any]: | |
| self.engine.output_processor.abort_requests(request_ids) | ||
| await self.engine.engine_core.abort_requests_async(request_ids) | ||
|
|
||
| # Try to reset prefix cache to ensure clean state | ||
| if reset_prefix_cache: | ||
| await self.clear_kv_cache() | ||
| logger.info("Prefix cache reset after abort") | ||
|
|
||
| logger.info(f"Aborted {len(request_ids)} requests: {request_ids}") | ||
| return {"aborted_count": len(request_ids), "request_ids": request_ids} | ||
|
|
||
| except Exception as e: | ||
| logger.error(f"Error aborting requests: {e}") | ||
| return {"aborted_count": 0, "request_ids": [], "error": str(e)} | ||
|
|
||
| async def abort_request(self, request_id: str) -> dict[str, Any]: | ||
| async def abort_request(self, request_id: str, reset_prefix_cache: bool = True) -> dict[str, Any]: | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. When will we want to abort single request?
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This may not be used quite often, but we can leave it as an API for fine-grained control |
||
| """Abort a specific generation request. | ||
|
|
||
| Args: | ||
|
|
@@ -587,6 +592,11 @@ async def abort_request(self, request_id: str) -> dict[str, Any]: | |
| self.engine.output_processor.abort_requests([request_id]) | ||
| await self.engine.engine_core.abort_requests_async([request_id]) | ||
|
|
||
| # Try to reset prefix cache to ensure clean state | ||
| if reset_prefix_cache: | ||
| await self.clear_kv_cache() | ||
| logger.info(f"Prefix cache reset after abort request {request_id}") | ||
|
|
||
| logger.info(f"Aborted request: {request_id}") | ||
| return {"aborted": True, "request_id": request_id} | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should always reset_prefix_cache when abort request?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, we should reset prefix cache after abort as the rollout weights are usually updated after aborting.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If not reset, it may degenerate to a paradigm similar to pipelineRL