AI/dify
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/langgenius/dify.git synced 2025-08-14 23:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: thread_pool submit count in parallel workflow not releasing (#8549)

Browse Source
This commit is contained in:
takatost 2024-09-19 15:34:56 +08:00 committed by GitHub
parent 54b9e1f6d1
commit ffd2f61dd9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
api/core/workflow/graph_engine/graph_engine.py
View File

@ -61,6 +61,9 @@ class GraphEngineThreadPool(ThreadPoolExecutor):
return super().submit(fn, *args, **kwargs) return super().submit(fn, *args, **kwargs)
def task_done_callback(self, future):
self.submit_count -= 1
def check_is_full(self) -> None: def check_is_full(self) -> None:
print(f"submit_count: {self.submit_count}, max_submit_count: {self.max_submit_count}") print(f"submit_count: {self.submit_count}, max_submit_count: {self.max_submit_count}")
if self.submit_count > self.max_submit_count: if self.submit_count > self.max_submit_count:
@ -426,20 +429,22 @@ class GraphEngine:
): ):
continue continue
futures.append( future = self.thread_pool.submit(
self.thread_pool.submit( self._run_parallel_node,
self._run_parallel_node, **{
**{ "flask_app": current_app._get_current_object(), # type: ignore[attr-defined]
"flask_app": current_app._get_current_object(), # type: ignore[attr-defined] "q": q,
"q": q, "parallel_id": parallel_id,
"parallel_id": parallel_id, "parallel_start_node_id": edge.target_node_id,
"parallel_start_node_id": edge.target_node_id, "parent_parallel_id": in_parallel_id,
"parent_parallel_id": in_parallel_id, "parent_parallel_start_node_id": parallel_start_node_id,
"parent_parallel_start_node_id": parallel_start_node_id, },
},
)
) )
future.add_done_callback(self.thread_pool.task_done_callback)
futures.append(future)
succeeded_count = 0 succeeded_count = 0
while True: while True:
try: try: