From 1637a4e3059d7576a34500fc5f50f6b202da1dfa Mon Sep 17 00:00:00 2001 From: Liangsheng Yin Date: Sun, 18 Oct 2026 17:09:19 -0700 Subject: [PATCH] [Fix] scheduler: Clear stale `encoder_swa_reset` in `convert_decode_to_extend` (#45042) --- python/sglang/srt/managers/schedule_batch.py | 4 +++ ...schedule_batch_convert_decode_to_extend.py | 25 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/python/sglang/srt/managers/schedule_batch.py b/python/sglang/srt/managers/schedule_batch.py index d429ca6e5e..3cf6210fb7 100755 --- a/python/sglang/srt/managers/schedule_batch.py +++ b/python/sglang/srt/managers/schedule_batch.py @@ -3312,6 +3312,10 @@ class ScheduleBatch(ScheduleBatchDisaggregationDecodeMixin): # Also stale residue; None keeps the prefill result path from # re-reporting old prefill stats for what is decode work. self.prefill_stats = None + # Also stale residue: decode rows are never fresh placements, so they + # reset no encoder SWA window and fold no replay rows the vote missed. + if self.encoder_swa_reset is not None: + self.encoder_swa_reset = [False] * bs # A 1-token extend's position is arange(prefix, prefix + 1), so prefix # must be seq_len - 1; output_ids trails the row by one or zero and # cannot stand in for it. Rows past bs are a beam tail, not requests. diff --git a/test/registered/unit/managers/test_schedule_batch_convert_decode_to_extend.py b/test/registered/unit/managers/test_schedule_batch_convert_decode_to_extend.py index e51c7df089..ddabe103d0 100644 --- a/test/registered/unit/managers/test_schedule_batch_convert_decode_to_extend.py +++ b/test/registered/unit/managers/test_schedule_batch_convert_decode_to_extend.py @@ -7,6 +7,7 @@ drained. import unittest from array import array +from unittest.mock import MagicMock import torch @@ -20,6 +21,10 @@ from sglang.srt.managers.schedule_batch import ( # noqa: E402 Req, ScheduleBatch, ) +from sglang.srt.model_executor.encoder_swa_replay import ( # noqa: E402 + _reset_windows_and_collect_hits, + folded_replay_rows, +) register_cpu_ci(est_time=8, suite="base-a-test-cpu") @@ -102,6 +107,26 @@ class TestConvertDecodeToExtendGeometry(CustomTestCase): self.assertEqual(len(batch.prefix_lens), len(batch.reqs)) self._assert_geometry(batch, seq_lens) + def test_stale_encoder_swa_resets_fold_no_rows(self): + """The running batch keeps its prefill-time encoder SWA reset list; a + converted decode must not fold replay rows the DP vote did not count, + reset live windows, or trip the odd-prefix check.""" + reqs = [_FakeReq(num_prompt_tokens=6, num_output_tokens=1) for _ in range(2)] + batch = ScheduleBatch(reqs=reqs) + batch.forward_mode = ForwardMode.DECODE + batch.enable_overlap = True + batch.seq_lens_cpu = torch.tensor([8, 97], dtype=torch.int64) + batch.req_pool_indices = torch.tensor([3, 4]) + # Left by the prefill that placed the first request. + batch.encoder_swa_reset = [True] + batch.convert_decode_to_extend() + + self.assertEqual(folded_replay_rows(batch), 0) + window = MagicMock() + rows = _reset_windows_and_collect_hits(batch=batch, window=window) + self.assertEqual(rows, []) + window.reset.assert_not_called() + def test_short_seq_lens_fails_loudly(self): """A row/req divergence the slice cannot explain must raise, not silently truncate the way a plain zip would."""