From 6929afb528a8f923bc42872d4217f01ecec7e7de Mon Sep 17 00:00:00 2001 From: Shuwen Wang <47200617+alphabetc1@users.noreply.github.com> Date: Thu, 22 Oct 2026 11:19:21 +0800 Subject: [PATCH] [Fix] hisparse: Keep PD destination host pages until the decode KV release (#45108) --- python/sglang/srt/disaggregation/decode.py | 9 +-- .../test_deferred_decode_kv_release.py | 58 +++++++++++++++++++ 2 files changed, 61 insertions(+), 6 deletions(-) diff --git a/python/sglang/srt/disaggregation/decode.py b/python/sglang/srt/disaggregation/decode.py index 2d417b5dae..63450899ff 100644 --- a/python/sglang/srt/disaggregation/decode.py +++ b/python/sglang/srt/disaggregation/decode.py @@ -2738,6 +2738,9 @@ class DecodeTransferQueue(DecodeHiCacheTransferMixin): kv_manager._staging_handler = self.staging_handler def _release_request(self, decode_req: DecodeRequest) -> None: + # HiSparse host pages are the transfer destination; free them with the KV. + if self.scheduler.enable_hisparse: + self.scheduler.hisparse_coordinator.request_finished(decode_req.req) if self.enable_host_receive: discard_kv_cache_backup(decode_req.req, self.tree_cache, "host_pool") if decode_req.host_staged: @@ -2813,8 +2816,6 @@ class DecodeTransferQueue(DecodeHiCacheTransferMixin): [decode_req.req], decode_req.req.return_logprob, ) - if self.scheduler.enable_hisparse: - self.scheduler.hisparse_coordinator.request_finished(decode_req.req) requires_host_drain = ( self.enable_host_receive and decode_req.host_staged ) @@ -2864,10 +2865,6 @@ class DecodeTransferQueue(DecodeHiCacheTransferMixin): [decode_req.req], decode_req.req.return_logprob, ) - if self.scheduler.enable_hisparse: - self.scheduler.hisparse_coordinator.request_finished( - decode_req.req - ) self._clean_hicache_prefetch_resources(decode_req) self._release_request(decode_req) self._record_transfer_failure( diff --git a/test/registered/unit/disaggregation/test_deferred_decode_kv_release.py b/test/registered/unit/disaggregation/test_deferred_decode_kv_release.py index 4fcd2d8c19..133906bc6a 100644 --- a/test/registered/unit/disaggregation/test_deferred_decode_kv_release.py +++ b/test/registered/unit/disaggregation/test_deferred_decode_kv_release.py @@ -917,6 +917,64 @@ class TestFailedTransfersDeferOnEveryFailure(CustomTestCase): self.assertEqual(q._deferred_releases, []) +class TestHiSparseDestinationFollowsTheHold(CustomTestCase): + """Under HiSparse the transfer writes into the coordinator's host pages.""" + + def setUp(self): + super().setUp() + world_size = patch.object(dist, "get_world_size", return_value=1) + world_size.start() + self.addCleanup(world_size.stop) + + def _queue(self, mgr, log): + q = _make_pop_queue(mgr) + q.scheduler.enable_hisparse = True + q.scheduler.hisparse_coordinator = SimpleNamespace( + request_finished=lambda req: log.append(("hisparse", req.rid)) + ) + return q + + def _pop_and_resolve(self, q, mgr, room, log): + release = lambda req, *args, **kwargs: log.append(("kv", req.rid)) + with ( + patch.object(decode_mod, "prepare_abort"), + patch.object(decode_mod, "release_kv_cache", side_effect=release), + ): + q.pop_transferred() + at_failure = list(log) + generation = mgr.register_deferred_abort_room(room) + for prefill_rank in (0, 1): + mgr.note_abort_ack(room, prefill_rank, generation) + q.resolve_deferred_releases() + return at_failure + + def test_deferred_failure_keeps_the_destination_until_release(self): + mgr = _make_manager() + log = [] + q = self._queue(mgr, log) + q.queue = [_make_failed_req(mgr, room=12, idx=6, abort_notified=False)] + + at_failure = self._pop_and_resolve(q, mgr, 12, log) + + self.assertEqual(at_failure, []) + self.assertEqual(log, [("hisparse", "r12"), ("kv", "r12")]) + + def test_immediate_failure_frees_the_destination_once(self): + mgr = _make_manager() + log = [] + q = self._queue(mgr, log) + q.queue = [ + _make_failed_req( + mgr, room=13, idx=7, abort_notified=False, notifiable=False + ) + ] + + at_failure = self._pop_and_resolve(q, mgr, 13, log) + + self.assertEqual(at_failure, [("hisparse", "r13"), ("kv", "r13")]) + self.assertEqual(log, at_failure) + + class TestBackendOptIn(CustomTestCase): """Without a prefill ack, every hold waits out the full release timeout."""