-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
[Bugfix][Core] Fix and refactor logging stats #4336
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks good. Wonder if we can add an unit test for this inside
def test_api_server(api_server, tokenizer_pool_size: int, worker_use_ray: bool, |
@rkooo567 I use |
Hmm when you don't use capsys and run the test, does it print the server logs? probably because api server is running in a subprocess, and their stdout/stderr is not printed. I think you can use https://docs.python.org/3/library/subprocess.html#subprocess.Popen.communicate to get stdout/stderr (in this case, you may not even need capsys) |
@rkooo567 It will print log when i add args with subprocess.Popen(commands,
stdout=subprocess.PIPE,
stderr=subprocess.STDOUT) as uvicorn_process:
output, _ = uvicorn_process.communicate()
output = output.decode(locale.getpreferredencoding())
assert "prompt" in output
yield But this will block test. 🫠 |
In [13]: def f():
...: from subprocess import TimeoutExpired
...: proc = subprocess.Popen(["python", "a.py"])
...: try:
...: outs, errs = proc.communicate(timeout=3)
...: except TimeoutExpired:
...: proc.kill()
...: outs, errs = proc.communicate()
...: print(outs)
...: print(errs) I think you can make this way to terminate the subprocess? |
@rkooo567 Thanks for you help. But My local test is ok while not in our CI. |
Is it okay if I try something on this PR directly? |
No problem. |
I took a look. I feel like we are hitting https://www.reddit.com/r/Python/comments/1vbie0/subprocesspipe_will_hang_indefinitely_if_stdout/. I worked around it by redirecting logs to tempfile. This will hinder debuggability, so I added logs to explain how to debug. See this PR rkooo567#25. or if you give me persmission to your repo, I can push there directly (it seems like it is not allowed) |
@rkooo567 I revert test changes in this PR, can we merge this first and then submit your changes in another PR? |
yeah that sgtm! |
cc @cadedaniel to merge |
Thanks guys -- can we get testing in your PR @rkooo567 ? |
I am retrying the basic correctness test -- seems it failed for an infra error |
Currently engine stats log will output
0
when using--engine-use-ray
.And this PR compact logging stats code by using existed function.
BEFORE SUBMITTING, PLEASE READ THE CHECKLIST BELOW AND FILL IN THE DESCRIPTION ABOVE
PR Checklist (Click to Expand)
Thank you for your contribution to vLLM! Before submitting the pull request, please ensure the PR meets the following criteria. This helps vLLM maintain the code quality and improve the efficiency of the review process.
PR Title and Classification
Only specific types of PRs will be reviewed. The PR title is prefixed appropriately to indicate the type of change. Please use one of the following:
[Bugfix]
for bug fixes.[CI/Build]
for build or continuous integration improvements.[Doc]
for documentation fixes and improvements.[Model]
for adding a new model or improving an existing model. Model name should appear in the title.[Frontend]
For changes on the vLLM frontend (e.g., OpenAI API server,LLM
class, etc.)[Kernel]
for changes affecting CUDA kernels or other compute kernels.[Core]
for changes in the core vLLM logic (e.g.,LLMEngine
,AsyncLLMEngine
,Scheduler
, etc.)[Hardware][Vendor]
for hardware-specific changes. Vendor name should appear in the prefix (e.g.,[Hardware][AMD]
).[Misc]
for PRs that do not fit the above categories. Please use this sparingly.Note: If the PR spans more than one category, please include all relevant prefixes.
Code Quality
The PR need to meet the following code quality standards:
format.sh
to format your code.docs/source/
if the PR modifies the user-facing behaviors of vLLM. It helps vLLM user understand and utilize the new features or changes.Notes for Large Changes
Please keep the changes as concise as possible. For major architectural changes (>500 LOC excluding kernel/data/config/test), we would expect a GitHub issue (RFC) discussing the technical design and justification. Otherwise, we will tag it with
rfc-required
and might not go through the PR.What to Expect for the Reviews
The goal of the vLLM team is to be a transparent reviewing machine. We would like to make the review process transparent and efficient and make sure no contributor feel confused or frustrated. However, the vLLM team is small, so we need to prioritize some PRs over others. Here is what you can expect from the review process:
action-required
label on the PR if there are changes required. The contributor should address the comments and ping the reviewer to re-review the PR.Thank You
Finally, thank you for taking the time to read these guidelines and for your interest in contributing to vLLM. Your contributions make vLLM a great tool for everyone!