[BugFix] Avoid premature async generator exit and raise all exception variations #7698
Conversation
This file contains 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
|
👋 Hi! Thank you for contributing to the vLLM project. Once the PR is approved and ready to go, please make sure to run full CI as it is required to merge (or just use auto-merge). To run full CI, you can do one of these:
🚀 |
joerunde
reviewed
Aug 20, 2024
vllm/engine/async_llm_engine.py
Outdated
| if isinstance(result, Exception): | ||
| if isinstance(result, BaseException) or \ | ||
| (isinstance(result, type) and \ | ||
| issubclass(result, BaseException)): |
The async generator returned by AsyncLLMEngine generate() uses a queue of either request outputs and/or exceptions. But the logic consuming requests from the queue only raises instances of Exceptions, not Exception classes (which are also raisable in python). This means that the CancelledError class instance we add to the queue elsewhere currently isn't being raised from the generator as it should be.
njhill
force-pushed
the
fix-raise-cancelled
branch
from
c397d04 to
db8aebc
Compare
njhill
changed the title
njhill
added
ready
Closed
robertgshaw2-redhat
approved these changes
Aug 21, 2024
patrickvonplaten
pushed a commit
to patrickvonplaten/vllm
that referenced
this pull request
Aug 21, 2024
omrishiv
pushed a commit
to omrishiv/vllm
that referenced
this pull request
Aug 26, 2024
Alvant
pushed a commit
to compressa-ai/vllm
that referenced
this pull request
Oct 26, 2024
… variations (vllm-project#7698) Signed-off-by: Alvant <[email protected]>
KuntaiDu
pushed a commit
to KuntaiDu/vllm
that referenced
this pull request
Nov 20, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
The async generator returned by AsyncLLMEngine generate() uses a queue of either request outputs and/or exceptions.
But the logic consuming requests from the queue only raises instances of Exceptions, not Exception classes (which are also raisable in python). This means that the CancelledError class instance we add to the queue elsewhere currently isn't being raised from the generator as it should be.
Furthermore, the generator will incorrectly exit prematurely if the sequence is completed in the engine prior to all response outputs being consumed.
I think these problems were introduced in my earlier rework of the async cancellation in #7111.
Added new tests to cover these cases.