diff --git a/experimental/sgl-router/src/state/kv_events/subscriber.rs b/experimental/sgl-router/src/state/kv_events/subscriber.rs index ab50989dbd..7b23ddfdc7 100644 --- a/experimental/sgl-router/src/state/kv_events/subscriber.rs +++ b/experimental/sgl-router/src/state/kv_events/subscriber.rs @@ -671,8 +671,8 @@ async fn fill_gap( /// only `from..to`. The publisher replies in sequence order, so stop once the /// gap's end is reached without waiting for newer batches or their END_SEQ. /// Wire contract: `ZmqEventPublisher._service_replay` in SGLang's -/// `disaggregation/kv_events.py`; replies are `[b"", seq, payload]` up to an -/// `END_SEQ` frame. +/// `disaggregation/kv_events.py`; replies carry `[b"", topic, seq, payload]` +/// up to `END_SEQ`. Legacy publishers omit the topic. async fn fetch_replay( endpoint: &str, from: i64, @@ -686,11 +686,14 @@ async fn fetch_replay( dealer.send(request).await?; loop { let reply = dealer.recv().await?; - let (3, Some(delim), Some(seq), Some(payload)) = - (reply.len(), reply.get(0), reply.get(1), reply.get(2)) - else { - return Err(anyhow!("replay reply has {} frames", reply.len())); + let seq_index = match reply.len() { + 3 => 1, // Legacy: [delimiter, sequence, payload] + 4 => 2, // Current: [delimiter, topic, sequence, payload] + len => return Err(anyhow!("replay reply has {len} frames")), }; + let delim = reply.get(0).context("replay delimiter frame")?; + let seq = reply.get(seq_index).context("replay seq frame")?; + let payload = reply.get(seq_index + 1).context("replay payload frame")?; if !delim.is_empty() { return Err(anyhow!("replay reply lacks the empty delimiter frame")); } diff --git a/python/sglang/srt/disaggregation/kv_events.py b/python/sglang/srt/disaggregation/kv_events.py index 36013d4ef6..18dfe7cf7d 100644 --- a/python/sglang/srt/disaggregation/kv_events.py +++ b/python/sglang/srt/disaggregation/kv_events.py @@ -600,15 +600,12 @@ class ZmqEventPublisher(EventPublisher): for seq, buf in self._buffer: if seq >= start_seq: - # [identity, empty_delim, seq_bytes, payload] - # (identity, empty_delim) are stripped off by the router - # receiving payload is (seq_bytes, payload) + # Subscribers receive the same topic, sequence, and payload as live events. self._replay.send_multipart( - (client_id, b"", seq.to_bytes(8, "big"), buf) + (client_id, b"", self._topic_bytes, seq.to_bytes(8, "big"), buf) ) # Send end of sequence marker - # receiving payload is (-1, b""") - self._replay.send_multipart((client_id, b"", self.END_SEQ, b"")) + self._replay.send_multipart((client_id, b"", b"", self.END_SEQ, b"")) @staticmethod def offset_endpoint_port( diff --git a/test/registered/unit/disaggregation/test_kv_events.py b/test/registered/unit/disaggregation/test_kv_events.py index 81b3e2d2d4..865e76718a 100644 --- a/test/registered/unit/disaggregation/test_kv_events.py +++ b/test/registered/unit/disaggregation/test_kv_events.py @@ -372,7 +372,10 @@ class TestReplay(CustomTestCase): # The router's DEALER client relies on this exact framing. replay = f"tcp://127.0.0.1:{get_free_port()}" publisher = ZmqEventPublisher( - attn_dp_rank=0, endpoint="inproc://kv-replay-test", replay_endpoint=replay + attn_dp_rank=0, + endpoint="inproc://kv-replay-test", + replay_endpoint=replay, + topic="kv@prefill@model", ) dealer = zmq.Context.instance().socket(zmq.DEALER) dealer.setsockopt(zmq.RCVTIMEO, 5000) @@ -386,10 +389,16 @@ class TestReplay(CustomTestCase): finally: dealer.close(linger=0) publisher.shutdown() - seqs = [int.from_bytes(f[1], "big", signed=True) for f in frames] + self.assertEqual([len(f) for f in frames], [4, 4, 4]) + seqs = [int.from_bytes(f[2], "big", signed=True) for f in frames] self.assertEqual(seqs, [1, 2, -1]) self.assertEqual([f[0] for f in frames], [b""] * 3) - self.assertEqual(frames[2][2], b"") + self.assertEqual([f[1] for f in frames], [b"kv@prefill@model"] * 2 + [b""]) + for frame in frames[:2]: + batch = msgspec.msgpack.decode(frame[3], type=KVEventBatch) + self.assertEqual(batch.events, [AllBlocksCleared()]) + self.assertEqual(batch.attn_dp_rank, 0) + self.assertEqual(frames[2][3], b"") if __name__ == "__main__":