Skip to content

Commit 1e5fe27

Browse files
hiworldwzjnone
authored andcommitted
fix
1 parent 88ec78f commit 1e5fe27

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

lightllm/server/router/req_queue/chunked_prefill/beam_impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def generate_new_batch(self, current_batch: Batch):
9191
aborted_count = 0
9292
cur_group_reqs = []
9393
for req in self.waiting_req_list:
94-
if req.is_aborted or req.stop_str_matched:
94+
if req.is_aborted:
9595
aborted_count += 1
9696
abort_req_list.append(req)
9797
continue

lightllm/server/router/req_queue/chunked_prefill/impl.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def generate_new_batch(self, current_batch: Batch):
7878
waiting_queue = self.waiting_req_list
7979

8080
for req in waiting_queue:
81-
if req.is_aborted or req.stop_str_matched:
81+
if req.is_aborted:
8282
# 由于管理的复杂性,只有没有被调度运行过的请求可以因为abort直接在队列中忽略掉.
8383
# 暂停的请求需要恢复后,由 router manager 部分来过滤。暂时保持这种处理方法, 否则会导致管理token的泄漏
8484
aborted_count += 1

lightllm/server/router/req_queue/chunked_prefill/impl_for_pd_decode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def generate_new_batch(self, current_batch: Batch):
3838
abort_req_list = []
3939
aborted_count = 0
4040
for req in self.waiting_req_list:
41-
if req.is_aborted or req.stop_str_matched:
41+
if req.is_aborted:
4242
# 由于管理的复杂性,只有没有被调度运行过的请求可以因为abort直接在队列中忽略掉.
4343
# 暂停的请求需要恢复后,由 router manager 部分来过滤。暂时保持这种处理方法, 否则会导致管理token和管理req对象的泄漏
4444
aborted_count += 1

0 commit comments

Comments
 (0)