-
Notifications
You must be signed in to change notification settings - Fork 756
[APIServer][BugFix] Fix gunicorn fork deadlock and multi-dp pipe issue in get_save_output_v1 #8088
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Jiang-Jia-Jun
merged 5 commits into
PaddlePaddle:develop
from
liyonghua0910:develop+20260701_fix_fork
Jul 6, 2026
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
990cfac
[APIServer] launch server app by uvicorn instead of gunicorn when the…
liyonghua0910 ac22f3c
[BugFix] fix get_save_output_v1 pipe in multi-dp services
liyonghua0910 19bc9ea
[APIServer] fix graceful shutdown
liyonghua0910 7afa06a
[BugFix] fix model runner get_save_output rank
liyonghua0910 1892433
[Test] fix ci
liyonghua0910 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -422,21 +422,17 @@ def process_sampling_results_use_zmq(self): | |
| """ | ||
| if self.speculative_decoding: | ||
| raise NotImplementedError("GET_SAVE_OUTPUT_V1 does not support speculative decoding") | ||
| rank_id = self.cfg.parallel_config.local_data_parallel_id | ||
| while True: | ||
| try: | ||
| if ( | ||
| self.cfg.parallel_config.enable_expert_parallel and self.cfg.parallel_config.data_parallel_size > 1 | ||
| ) or (rank_id == 0): | ||
| receive_datas = self.zmq_server.recv_pyobj() | ||
| assert isinstance(receive_datas, list) | ||
| if envs.FD_DEBUG: | ||
| llm_logger.debug(f"token_processor receive_data {receive_datas}") | ||
| receive_datas = self.zmq_server.recv_pyobj() | ||
This comment was marked as outdated.
Sorry, something went wrong.
Collaborator
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 已修复,将 model runner 侧的 get_save_output rank 改为使用 local_data_parallel_id,而不使用 local_rank |
||
| assert isinstance(receive_datas, list) | ||
| if envs.FD_DEBUG: | ||
| llm_logger.debug(f"token_processor receive_data {receive_datas}") | ||
|
|
||
| self._reschedule_preempt_task_use_zmq(receive_datas) | ||
| self._reschedule_preempt_task_use_zmq(receive_datas) | ||
|
|
||
| batch_result = self._process_batch_output_use_zmq(receive_datas) | ||
| self.postprocess(batch_result) | ||
| batch_result = self._process_batch_output_use_zmq(receive_datas) | ||
| self.postprocess(batch_result) | ||
| except Exception as e: | ||
| log_request_error( | ||
| message="Receive message:{receive_datas}, error:{error}, {traceback}", | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.