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

revert: remove enable_stream_row_count config #10261 #11328

Merged
merged 1 commit into from
Aug 18, 2023
Merged

revert: remove enable_stream_row_count config #10261 #11328

merged 1 commit into from
Aug 18, 2023

Conversation

lmatz
Copy link
Contributor

@lmatz lmatz commented Jul 31, 2023

I hereby agree to the terms of the RisingWave Labs, Inc. Contributor License Agreement.

What's changed and what's your intention?

Checklist

  • I have written necessary rustdoc comments
  • I have added necessary unit tests and integration tests
  • I have added fuzzing tests or opened an issue to track them. (Optional, recommended for new SQL features Sqlsmith: Sql feature generation #7934).
  • My PR contains breaking changes. (If it deprecates some features, please create a tracking issue to remove them in the future).
  • All checks passed in ./risedev check (or alias, ./risedev c)
  • My PR changes performance-critical code. (Please run macro/micro-benchmarks and show the results.)
  • My PR contains critical fixes that are necessary to be merged into the latest release. (Please check out the details)

Documentation

  • My PR contains user-facing changes.
Click here for Documentation

Types of user-facing changes

Please keep the types that apply to your changes, and remove the others.

  • Installation and deployment
  • Connector (sources & sinks)
  • SQL commands, functions, and operators
  • RisingWave cluster configuration changes
  • Other (please specify in the release note below)

Release note

@BugenZhao
Copy link
Member

Interesting. May I ask for the motivation?

@lmatz
Copy link
Contributor Author

lmatz commented Aug 1, 2023

With 500+ MV on a single machine, one user's Prometheus takes 16GB.
And Grafana just cannot show most of the metrics, always loading

@lmatz
Copy link
Contributor Author

lmatz commented Aug 1, 2023

I am thinking just giving MV and sinks two dedicated metrics, or judging actor_id_string or other similar things to enable row_executor_count just for MV and sinks.

@lmatz
Copy link
Contributor Author

lmatz commented Aug 17, 2023

SCR-20230817-u6l

Added a sink_info metric into Prom so that we can get the actor_id -> sink_name when building the panel.

Sink and MV still always get the metrics. Other executors do not, but it is configurable.

@BugenZhao Please take another look after and only after you come back from the vacation

@codecov
Copy link

codecov bot commented Aug 17, 2023

Codecov Report

Merging #11328 (21933ff) into main (0874a48) will decrease coverage by 0.03%.
Report is 2 commits behind head on main.
The diff coverage is 27.27%.

@@            Coverage Diff             @@
##             main   #11328      +/-   ##
==========================================
- Coverage   70.28%   70.26%   -0.03%     
==========================================
  Files        1366     1366              
  Lines      228417   228458      +41     
==========================================
- Hits       160541   160515      -26     
- Misses      67876    67943      +67     
Flag Coverage Δ
rust 70.26% <27.27%> (-0.03%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
src/stream/src/executor/wrapper.rs 0.00% <0.00%> (ø)
src/stream/src/executor/wrapper/trace.rs 0.00% <ø> (ø)
src/stream/src/task/stream_manager.rs 1.74% <0.00%> (-0.01%) ⬇️
src/meta/src/rpc/metrics.rs 77.06% <45.00%> (-1.02%) ⬇️
src/common/src/config.rs 83.11% <100.00%> (+0.09%) ⬆️

... and 7 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

Copy link
Member

@BugenZhao BugenZhao left a comment

Choose a reason for hiding this comment

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

LGTM. PTAL @hzxa21 🥰

@@ -38,14 +39,16 @@ pub async fn trace(

let span_name = pretty_identity(&info.identity, actor_id, executor_id);

let is_sink_or_mv = info.identity.contains("Materialize") || info.identity.contains("Sink");
Copy link
Member

Choose a reason for hiding this comment

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

This seems fragile but I'm unsure if there's a better way.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

let me open an issue to track this, a quick fix for Kaito

Copy link
Collaborator

Choose a reason for hiding this comment

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

+1. It seems a little bit hacky here.

@lmatz lmatz added this pull request to the merge queue Aug 18, 2023
@@ -38,14 +39,16 @@ pub async fn trace(

let span_name = pretty_identity(&info.identity, actor_id, executor_id);

let is_sink_or_mv = info.identity.contains("Materialize") || info.identity.contains("Sink");
Copy link
Collaborator

Choose a reason for hiding this comment

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

+1. It seems a little bit hacky here.

@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Aug 18, 2023
@lmatz lmatz added this pull request to the merge queue Aug 18, 2023
Merged via the queue into main with commit 4c04b9e Aug 18, 2023
@lmatz lmatz deleted the lz/revert branch August 18, 2023 04:27
@zwang28
Copy link
Contributor

zwang28 commented Aug 18, 2023

After this PR, the resulted file size can still be as large as 400MB.
curl -v http://127.0.0.1:[cn prometheus port]/api/v1/query

After this PR, the resulted file size reduces from 600MB to 100MB:
Though it's still large, at least grafana can present it now.

The file is too large to attach here.

@zwang28
Copy link
Contributor

zwang28 commented Aug 18, 2023

Storage metric takes up 80%.

zzzzz:~ z28wang$ grep "state_store" cn.prom_query.2.log |wc -l
 4236008
zzzzz:~ z28wang$ grep "actor" cn.prom_query.2.log | wc -l
 1572093
zzzzz:~ z28wang$ grep "stream" cn.prom_query.2.log |wc -l
 1435195
zzzzz:~ z28wang$ cat cn.prom_query.2.log | wc -l
 5821215
zzzzz:~ z28wang$ du -h cn.prom_query.2.log
464M	cn.prom_query.2.log

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants