From 34b1e9f7a61e802b870c7d7f78bf90b000b691cc Mon Sep 17 00:00:00 2001 From: Zhewen Li Date: Mon, 7 Sep 2026 00:18:30 -0700 Subject: [PATCH] [Bugfix][MooncakeStore] Fix finish-time save crash on hybrid models (#54643) Signed-off-by: zhewenl Co-authored-by: zhewenl --- .../unit/test_mooncake_store_scheduler.py | 27 +++++++++++++++++++ .../v1/mooncake/store/scheduler.py | 7 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/tests/v1/kv_connector/unit/test_mooncake_store_scheduler.py b/tests/v1/kv_connector/unit/test_mooncake_store_scheduler.py index 110a83db48..7990c4997c 100644 --- a/tests/v1/kv_connector/unit/test_mooncake_store_scheduler.py +++ b/tests/v1/kv_connector/unit/test_mooncake_store_scheduler.py @@ -199,6 +199,33 @@ def _add_unfinished_request( ) +def test_pending_load_for_non_chosen_connector_is_dropped(): + """A MultiConnector loser must not turn its proposed load into a save.""" + scheduler = _make_bare_scheduler() + request = SimpleNamespace( + request_id="req-0", + block_hashes=[b"h0", b"h1", b"h2"], + ) + blocks = SimpleNamespace(get_block_ids=lambda: ([1, 2], [9])) + scheduler.load_specs["req-0"] = LoadSpec( + vllm_cached_tokens=0, + kvpool_cached_tokens=48, + can_load=False, + ) + + scheduler.update_state_after_alloc(request, blocks, num_external_tokens=0) + meta = scheduler.build_connector_meta(_make_pending_load_scheduler_output()) + + # MultiConnector exposes the real allocation to every child, but only the + # chosen child receives external tokens. The losing store connector must + # neither retain those blocks for a pending load nor enqueue a save from + # the rejected speculative LoadSpec. + assert scheduler._unfinished_requests["req-0"][1] == () + assert meta.requests == [] + assert "req-0" not in scheduler.load_specs + assert "req-0" not in scheduler._request_trackers + + def test_update_state_excludes_nontransfer_groups(): """Store metadata must match the worker's registered cache groups.""" scheduler = _make_bare_scheduler() diff --git a/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/store/scheduler.py b/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/store/scheduler.py index b36f31e727..1c06560d61 100644 --- a/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/store/scheduler.py +++ b/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/store/scheduler.py @@ -372,7 +372,12 @@ class MooncakeStoreScheduler: ) in self._unfinished_requests.items(): if request_id not in request_ids and request_id not in cached_reqs.req_ids: load_spec = self.load_specs.pop(request_id, None) - if not load_spec: + # A load spec may have been proposed by this connector's + # lookup but rejected by MultiConnector in favor of another + # connector. Only the chosen connector may issue the pending + # load; the normal store path gets its blocks later from + # SchedulerOutput once the request is actually scheduled. + if load_spec is None or not load_spec.can_load: continue num_tokens_to_compute = load_spec.kvpool_cached_tokens request_tracker = RequestTracker(