From 5f30fc7031cae49bf51073fc953d419b08f8887c Mon Sep 17 00:00:00 2001 From: Yicong Wang Date: Sat, 3 Oct 2026 15:28:00 +0800 Subject: [PATCH] [Bugfix][KV Connector][Mooncake] Suppress completion for empty pulls (#59347) Signed-off-by: wangyicong --- .../unit/test_mooncake_connector.py | 34 +++++++++++++++++++ .../v1/mooncake/mooncake_connector.py | 4 ++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/tests/v1/kv_connector/unit/test_mooncake_connector.py b/tests/v1/kv_connector/unit/test_mooncake_connector.py index c306103288..d326615aad 100644 --- a/tests/v1/kv_connector/unit/test_mooncake_connector.py +++ b/tests/v1/kv_connector/unit/test_mooncake_connector.py @@ -1549,6 +1549,40 @@ async def test_kv_producer(monkeypatch): prefill_worker.shutdown() +@pytest.mark.parametrize( + ("local_block_ids", "expected_finished"), + [ + ([], set()), + ([[]], set()), + ([[100]], {"d-req-1"}), + ], +) +def test_pull_completion_requires_local_blocks( + local_block_ids: list[list[int]], + expected_finished: set[str], +): + worker = MooncakeConnectorWorker.__new__(MooncakeConnectorWorker) + worker.shutdown = MagicMock() + worker.finished_recving_reqs = set() + pull_meta = PullReqMeta( + d_req_id="d-req-1", + transfer_id="xfer-req-1", + local_block_ids=local_block_ids, + remote_engine_id="p-engine", + remote_bootstrap_addr="http://bootstrap:33333", + pull_tasks_count=1, + ) + response = MooncakeXferResponse( + status=MooncakeXferResponseStatus.FINISH, + ok_reqs=["d-req-1"], + ) + + worker.process_pulling_result(response, {"d-req-1": pull_meta}) + + assert pull_meta.pull_tasks_count == 0 + assert worker.finished_recving_reqs == expected_finished + + @pytest.mark.asyncio async def test_kv_consumuer(monkeypatch): """Simulates a Consumer Worker (Decoder) initiating a pull from a Producer. diff --git a/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/mooncake_connector.py b/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/mooncake_connector.py index 1f1ca517f3..172d41efdb 100644 --- a/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/mooncake_connector.py +++ b/vllm/distributed/kv_transfer/kv_connector/v1/mooncake/mooncake_connector.py @@ -2407,7 +2407,9 @@ class MooncakeConnectorWorker: continue # No race because we are in async loop. pull_meta.pull_tasks_count -= 1 - if pull_meta.pull_tasks_count == 0: + # Empty pulls only release the producer's blocks; the consumer + # did not enter WAITING_FOR_REMOTE_KVS. + if pull_meta.pull_tasks_count == 0 and any(pull_meta.local_block_ids): self.finished_recving_reqs.add(pull_meta.d_req_id) if ok_reqs: