update

Author: root

lightllm/server/router/manager.py

@@ -397,7 +397,9 @@ def _add_req(self, group_req_indexes: GroupReqIndexes):
 
     def _generate_new_batch(self):
         # 调度的时候需要考虑当前运行的batch，和调度了但是暂时还没有推理的部分请求。
-        new_batch = self.req_queue.generate_new_batch(self.schedule_new_batch)
+        new_batch = self.req_queue.generate_new_batch(
+            Batch.merge_two_batch(self.running_batch, self.schedule_new_batch)
+        )
         self.schedule_new_batch = Batch.merge_two_batch(self.schedule_new_batch, new_batch)
         return
 

lightllm/server/router/req_queue/dp_balancer/dp_base_balancer.py

@@ -17,7 +17,6 @@ class DpBalancer(ABC):
     def __init__(self, dp_size_in_node: int, inner_queues: List[BaseQueue]):
         self.dp_size_in_node = dp_size_in_node
         self.inner_queues = inner_queues
-        self.pre_select_dp_index = self.dp_size_in_node - 1
 
     @abstractmethod
     def assign_reqs_to_dp(self, current_batch: Batch, reqs_waiting_for_dp_index: List[Union[Req, List[Req]]]) -> None:
@@ -30,6 +29,10 @@ class RoundRobinDpBalancer(DpBalancer):
     在队列长度最小的DP中进行轮询选择
     """
 
+    def __init__(self, dp_size_in_node: int, inner_queues: List[BaseQueue]):
+        super().__init__(dp_size_in_node, inner_queues)
+        self.pre_select_dp_index = self.dp_size_in_node - 1
+
     def get_suggest_dp_index(
         self,
     ) -> int: