Repository navigation
[None][fix] Complete queued context cancellations before activation - #21482
Conversation
|
/bot run --disable-fail-fast |
|
PR_Github #82109 [ run ] triggered by Bot. Commit: |
|
No actionable comments were generated in the recent review. WalkthroughThe executor now cancels eligible queued context-only requests before admission and publishes cancellation responses. The worker handles final cancelled results without context logits. Tests cover queue behavior, response handling, and prompt-logprob behavior. ChangesQueued Context Cancellation
Estimated code review effort: 3 (Moderate) | ~25 minutes Change: Bug fix Sequence Diagram(s)sequenceDiagram
participant PyExecutor
participant WaitingQueue
participant ResponseQueue
PyExecutor->>WaitingQueue: Remove matching queued context request
PyExecutor->>ResponseQueue: Enqueue cancellation responses
Merge Risk:
|
|
PR_Github #82109 [ run ] completed with state
|
Signed-off-by: Chien-Chun Hung <2679986+chienchunhung@users.noreply.github.com>
7a3287f to
a0d3a61
Compare
|
/bot run --disable-fail-fast |
|
PR_Github #82201 [ run ] triggered by Bot. Commit: |
|
PR_Github #82201 [ run ] completed with state
|
cascade812
left a comment
There was a problem hiding this comment.
The fix only covers REQUEST_TYPE_CONTEXT_ONLY. A queued CONTEXT_AND_GENERATION request (normal non-disaggregated serving) that gets cancelled still goes through _handle_canceled_requests. That removes it from the waiting queue without sending any response.
It's an existing gap, not a regression, but it's the same problem in the same place, should we fix it as well?
|
Automatically added "ci: full pre-merge approved" because this PR has satisfied the required GitHub review approvals. Unresolved review conversations and other required checks remain independent merge requirements. |
Thanks @cascade812 . This PR targets queued, never-activated CTX-only requests in both context-first and generation-first disaggregated serving. You are right that ordinary |
|
/bot run --disable-fail-fast |
|
PR_Github #82372 [ run ] triggered by Bot. Commit: |
|
PR_Github #82372 [ run ] completed with state
|
|
/bot run --disable-fail-fast |
|
PR_Github #82544 [ run ] triggered by Bot. Commit: |
|
PR_Github #82544 [ run ] completed with state |
Summary
Complete cancelled, never-activated CTX-only requests before executor admission. They return a terminal result without waiting for capacity, another model batch, a GEN request, or the transfer timeout.
Scope
CONTEXT_AND_GENERATIONrequests, GEN-only requests, KV connectors, retries, and transfer-retirement policy are unchanged. Ordinary queued serving is a separate follow-up.Verification
a0d3a61in CI #67830; the 301-case executor module also passed on both.Notes
This queue-only change does not depend on #21272 or #21291. Keep the shared prompt-logprob guard and tests as one implementation when merging #21291. No public API or configuration change.