Skip to content
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 ] Fix Prometheus Metrics With zeromq Frontend #7279

Merged
merged 42 commits into from
Aug 18, 2024

Conversation

robertgshaw2-redhat
Copy link
Collaborator

@robertgshaw2-redhat robertgshaw2-redhat commented Aug 7, 2024

SUMMARY:

  • Prometheus metrics are broken in v0.5.4 due to zeromq multiprocessing frontend
  • Set PROMETHEUS_MULTIPROC_DIR environment variable to enable multiprocessing mode (note, this must be set before prometheus_client is imported. So we lazily init anything that imports prometheus_client
  • Use tempfile for PROMETHEUS_MULTIPROC_DIR
  • Adds testing for metrics via the OpenAI endpoint (w/ more correctness tests)
  • Convert Info metrics to use Gauge set to 1

PERFORMANCE:
TPOT L8B H100 | 500 input | 150 output | 10QPS:

  • pr: 47.29
  • main: 45.42

There is a slight performance hit here. I think we should try to optimize prometheus in a separate effort where we move prometheus out of the main asyncio event loop

NOTES:

# HELP python_gc_objects_collected_total Objects collected during gc
# TYPE python_gc_objects_collected_total counter
python_gc_objects_collected_total{generation="0"} 11803.0
python_gc_objects_collected_total{generation="1"} 6448.0
python_gc_objects_collected_total{generation="2"} 3557.0
# HELP python_gc_objects_uncollectable_total Uncollectable objects found during GC
# TYPE python_gc_objects_uncollectable_total counter
python_gc_objects_uncollectable_total{generation="0"} 0.0
python_gc_objects_uncollectable_total{generation="1"} 0.0
python_gc_objects_uncollectable_total{generation="2"} 0.0
# HELP python_gc_collections_total Number of times this generation was collected
# TYPE python_gc_collections_total counter
python_gc_collections_total{generation="0"} 1546.0
python_gc_collections_total{generation="1"} 139.0
python_gc_collections_total{generation="2"} 11.0
# HELP python_info Python platform information
# TYPE python_info gauge
python_info{implementation="CPython",major="3",minor="8",patchlevel="19",version="3.8.19"} 1.0
# HELP process_virtual_memory_bytes Virtual memory size in bytes.
# TYPE process_virtual_memory_bytes gauge
process_virtual_memory_bytes 1.24949229568e+011
# HELP process_resident_memory_bytes Resident memory size in bytes.
# TYPE process_resident_memory_bytes gauge
process_resident_memory_bytes 7.277645824e+09
# HELP process_start_time_seconds Start time of the process since unix epoch in seconds.
# TYPE process_start_time_seconds gauge
process_start_time_seconds 1.72315136919e+09
# HELP process_cpu_seconds_total Total user and system CPU time spent in seconds.
# TYPE process_cpu_seconds_total counter
process_cpu_seconds_total 38.27
# HELP process_open_fds Number of open file descriptors.
# TYPE process_open_fds gauge
process_open_fds 101.0
# HELP process_max_fds Maximum number of open file descriptors.
# TYPE process_max_fds gauge
process_max_fds 1.048576e+06

FIX #7188

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:

  • We adhere to Google Python style guide and Google C++ style guide.
  • Pass all linter checks. Please use format.sh to format your code.
  • The code need to be well-documented to ensure future contributors can easily understand the code.
  • Include sufficient tests to ensure the project to stay correct and robust. This includes both unit tests and integration tests.
  • Please add documentation to 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:

  • After the PR is submitted, the PR will be assigned to a reviewer. Every reviewer will pick up the PRs based on their expertise and availability.
  • After the PR is assigned, the reviewer will provide status update every 2-3 days. If the PR is not reviewed within 7 days, please feel free to ping the reviewer or the vLLM team.
  • After the review, the reviewer will put an 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.
  • Please respond to all comments within a reasonable time frame. If a comment isn't clear or you disagree with a suggestion, feel free to ask for clarification or discuss the suggestion.

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!

Copy link

github-actions bot commented Aug 7, 2024

👋 Hi! Thank you for contributing to the vLLM project.
Just a reminder: PRs would not trigger full CI run by default. Instead, it would only run fastcheck CI which consists a small and essential subset of CI tests to quickly catch errors. You can run other CI tests on top of default ones by unblocking the steps in your fast-check build on Buildkite UI.

Once the PR is approved and ready to go, please make sure to run full CI as it is required to merge (or just use auto-merge).

To run full CI, you can do one of these:

  • Comment /ready on the PR
  • Add ready label to the PR
  • Enable auto-merge.

🚀

@robertgshaw2-redhat robertgshaw2-redhat changed the title [ Bugfix ] Fix Prometheus Metrics With MP FrontEnd [ Bugfix ] Fix Prometheus Metrics With zeromq Frontend Aug 7, 2024
@DarkLight1337
Copy link
Member

Would be great if we could add a test to check that vLLM-specific metrics are returned in the /metrics endpoint.

@robertgshaw2-redhat
Copy link
Collaborator Author

Would be great if we could add a test to check that vLLM-specific metrics are returned in the /metrics endpoint.

100% - poor test coverage here caused us to miss this impact in v0.5.4

@robertgshaw2-redhat robertgshaw2-redhat marked this pull request as ready for review August 8, 2024 20:41
@robertgshaw2-redhat
Copy link
Collaborator Author

@njhill @simon-mo - this should be ready to merge. There is a bit of a perf hit vs main, but I think we should go ahead and land this because it is the simplest approach by far

I will work to address the overhead of prometheus in a separate workstream. Specifically, promtheus should not be running in the main event loop.

Copy link
Member

@njhill njhill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @robertgshaw2-neuralmagic, just a couple of comments

)

def _create_info_cache_config(self) -> None:
# Config Information
self.info_cache_config = prometheus_client.Info(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Per @thekuffs's comment, I think we could actually keep the info metrics, just use a gauge explicitly here?

vllm/engine/metrics_types.py Show resolved Hide resolved
@njhill
Copy link
Member

njhill commented Aug 15, 2024

@robertgshaw2-neuralmagic looks like the CI has a legit failure too... I'm looking to see what's going on there

@robertgshaw2-redhat
Copy link
Collaborator Author

@robertgshaw2-neuralmagic looks like the CI has a legit failure too... I'm looking to see what's going on there

My b. GitHub was down. Will look

Copy link
Member

@njhill njhill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks @robertgshaw2-neuralmagic!

@njhill njhill added the ready ONLY add when PR is ready to merge/full CI is needed label Aug 18, 2024
@robertgshaw2-redhat robertgshaw2-redhat enabled auto-merge (squash) August 18, 2024 20:03
@robertgshaw2-redhat robertgshaw2-redhat merged commit e3b3182 into vllm-project:main Aug 18, 2024
47 checks passed
zifeitong pushed a commit to zifeitong/vllm that referenced this pull request Aug 20, 2024
fialhocoelho pushed a commit to opendatahub-io/vllm that referenced this pull request Aug 22, 2024
omrishiv pushed a commit to omrishiv/vllm that referenced this pull request Aug 26, 2024
Alvant pushed a commit to compressa-ai/vllm that referenced this pull request Oct 26, 2024
KuntaiDu pushed a commit to KuntaiDu/vllm that referenced this pull request Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready ONLY add when PR is ready to merge/full CI is needed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: No metrics exposed at /metrics with 0.5.4 and metrics completely unavailable
6 participants