From f24db6672957cccfcfef1024167a62b2d68ce258 Mon Sep 17 00:00:00 2001 From: Aurick Qiao Date: Sat, 3 Oct 2026 20:46:20 -0700 Subject: [PATCH] [PD] Publish prefill DP rank whenever forced lookup is enabled (#41786) --- .../sglang/srt/disaggregation/common/conn.py | 30 +++++------ .../test_register_to_bootstrap.py | 51 +++++++++++++++++++ 2 files changed, 66 insertions(+), 15 deletions(-) diff --git a/python/sglang/srt/disaggregation/common/conn.py b/python/sglang/srt/disaggregation/common/conn.py index 45359599ca..371bf2d291 100644 --- a/python/sglang/srt/disaggregation/common/conn.py +++ b/python/sglang/srt/disaggregation/common/conn.py @@ -1799,27 +1799,27 @@ class CommonKVSender(BaseKVSender): self.kv_mgr.update_status(self.bootstrap_room, KVPoll.Bootstrapping) if get_parallel().num_dp_ranks > 1 and not req_has_disagg_prefill_dp_rank: - if get_parallel().load_balance_method != "follow_bootstrap_room": + if ( + get_parallel().load_balance_method != "follow_bootstrap_room" + or envs.SGLANG_DISAGGREGATION_FORCE_QUERY_PREFILL_DP_RANK.get() + ): self._register_prefill_dp_rank() elif ( self.kv_mgr.attn_dp_rank != self.bootstrap_room % get_parallel().num_dp_ranks ): # follow_bootstrap_room was overridden by external routed_dp_rank - if envs.SGLANG_DISAGGREGATION_FORCE_QUERY_PREFILL_DP_RANK.get(): - self._register_prefill_dp_rank() - else: - self.kv_mgr.record_failure( - self.bootstrap_room, - f"follow_bootstrap_room conflict: dispatched to dp_rank " - f"{self.kv_mgr.attn_dp_rank} but bootstrap_room " - f"{self.bootstrap_room} implies dp_rank " - f"{self.bootstrap_room % get_parallel().num_dp_ranks}. " - f"Set SGLANG_DISAGGREGATION_FORCE_QUERY_PREFILL_DP_RANK=1 " - f"to allow mixed routing.", - ) - self.kv_mgr.update_status(self.bootstrap_room, KVPoll.Failed) - return + self.kv_mgr.record_failure( + self.bootstrap_room, + f"follow_bootstrap_room conflict: dispatched to dp_rank " + f"{self.kv_mgr.attn_dp_rank} but bootstrap_room " + f"{self.bootstrap_room} implies dp_rank " + f"{self.bootstrap_room % get_parallel().num_dp_ranks}. " + f"Set SGLANG_DISAGGREGATION_FORCE_QUERY_PREFILL_DP_RANK=1 " + f"to allow mixed routing.", + ) + self.kv_mgr.update_status(self.bootstrap_room, KVPoll.Failed) + return def _register_prefill_dp_rank(self): """Register this request's prefill dp_rank to the bootstrap server.""" diff --git a/test/registered/unit/disaggregation/test_register_to_bootstrap.py b/test/registered/unit/disaggregation/test_register_to_bootstrap.py index 312040e8d9..7a39fefbbe 100644 --- a/test/registered/unit/disaggregation/test_register_to_bootstrap.py +++ b/test/registered/unit/disaggregation/test_register_to_bootstrap.py @@ -26,6 +26,57 @@ class TestRegisterToBootstrap(CustomTestCase): override.install() self.addCleanup(override.restore) + def test_sender_dp_rank_registration(self): + from sglang.srt.disaggregation.base.conn import KVPoll + from sglang.srt.disaggregation.common.conn import CommonKVSender + + for force_query in (False, True): + for dp_rank in (0, 1): + with self.subTest(force_query=force_query, dp_rank=dp_rank): + mgr = MagicMock(is_dummy_cp_rank=False, attn_dp_rank=dp_rank) + sender = MagicMock(spec=CommonKVSender) + sender._register_prefill_dp_rank = ( + CommonKVSender._register_prefill_dp_rank.__get__(sender) + ) + with ( + patch( + "sglang.srt.disaggregation.common.conn.requests.post" + ) as mock_post, + get_context().override_server_args( + dp_size=4, load_balance_method="follow_bootstrap_room" + ), + envs.SGLANG_DISAGGREGATION_FORCE_QUERY_PREFILL_DP_RANK.override( + force_query + ), + ): + mock_post.return_value.status_code = 200 + CommonKVSender.__init__( + sender, + mgr=mgr, + bootstrap_addr="127.0.0.1:8765", + bootstrap_room=4, + dest_tp_ranks=[0], + pp_rank=0, + ) + + self.assertEqual( + mock_post.call_args_list, + [ + call( + "http://127.0.0.1:8765/register_dp_rank", + json={"bootstrap_room": 4, "dp_rank": dp_rank}, + timeout=5, + ) + ] + if force_query + else [], + ) + conflict = not force_query and dp_rank != 0 + self.assertEqual(mgr.record_failure.call_count, int(conflict)) + mgr.update_status.assert_called_with( + 4, KVPoll.Failed if conflict else KVPoll.Bootstrapping + ) + @patch("sglang.srt.disaggregation.common.conn.time") @patch("sglang.srt.disaggregation.common.conn.requests.put") def test_succeeds_on_first_attempt(self, mock_put, mock_time):