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.

Sign up for GitHub

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

Jump to bottom

Untwist apf metrics #110162

Merged
merged 1 commit into from May 25, 2022
Merged

Untwist apf metrics #110162

merged 1 commit into from May 25, 2022

Conversation

MikeSpreitzer
Copy link
Member

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

This PR removes the unhelpful use of the (waiting,executing) pair structure for the read_vs_write_request_count_samples and ..._watermark histograms. This histograms are not used in such a paired association.

This is part of the larger campaign to replace same-and-watermark histograms with timing ratio histograms. The actual replacement will come in a later PR, of which #110104 is the latest version.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

This PR is built on #110101. That means that currently this PR also includes the commits of #110101. Once that one merges, I will rebase this onto master.

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

/sig api-machinery
/cc @dgrisonnet
/cc @wojtek-t
@tkashem

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. area/apiserver area/test sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/testing Categorizes an issue or PR as relevant to SIG Testing. labels May 23, 2022
This was referenced May 23, 2022
Merged
Merged
@MikeSpreitzer
Copy link
Member Author

/retest

@MikeSpreitzer
Remove unhelpful pairing of members of read_vs_write_request_count_sa…
cd33c7c 
…mples

Members are not used in (waiting,executing) pairs, so stopped
using the wrapper that adds such pairing.
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels May 24, 2022
@MikeSpreitzer
Copy link
Member Author

The force-push to cd33c7c is the rebase onto master. Now GitHub shows just the changes of this PR.

dgrisonnet
dgrisonnet reviewed May 24, 2022
View reviewed changes
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/metrics/metrics.go Show resolved Hide resolved
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/metrics/sample_and_watermark.go Show resolved Hide resolved
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/metrics/sample_and_watermark.go
Comment on lines +55 to +56
RequestsWaiting: spg.urVec.NewForLabelValuesSafe(0, initialWaitingDenominator, append([]string{LabelValueWaiting}, labelValues...)),
RequestsExecuting: spg.urVec.NewForLabelValuesSafe(0, initialExecutingDenominator, append([]string{LabelValueExecuting}, labelValues...)),
Copy link
Member

Choose a reason for hiding this comment

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

the phase values are now passed down inside of labelValues with your recent changes

Copy link
Member Author

Choose a reason for hiding this comment

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

This PR stops using the pair layer for the read-vs-write vector, and does not change the use of the pairing layer for priority-oriented vector.

Copy link
Member

Choose a reason for hiding this comment

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

I am not sure I understand your point, we are still using this to initialize the watermarks: https://github.com/kubernetes/kubernetes/pull/110162/files#diff-d835764bb6390d3466e60b871d322044538e32acc03b67675d2aaba1d37e134dR95.

In the list of the label values passed down to this function we are already providing LabelValueExecuting when initializing the watermark, so we will end up with label values equal to []{"executing", "executing", "mutating"}, which means that the requestKind label will be set to executing instead of "mutating".

/hold

Copy link
Member Author

Choose a reason for hiding this comment

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

@dgrisonnet : note that this PR changes the line 95 that you cited from calling ReadWriteConcurrencyPairVec, omitting the phase label name in its arguments and letting that func add the phase label, to calling ReadWriteConcurrencyGaugeVec instead, which does not add the phase label to those given on line 95.

Copy link
Member

Choose a reason for hiding this comment

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

ah indeed, I got confused, thank you for clarifying

/unhold

@leilajal
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels May 24, 2022
@wojtek-t
Copy link
Member

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 25, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MikeSpreitzer, wojtek-t

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels May 25, 2022
@MikeSpreitzer
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label May 25, 2022
@k8s-ci-robot k8s-ci-robot merged commit cf314d6 into kubernetes:master May 25, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 25, 2022
@MikeSpreitzer MikeSpreitzer deleted the untwist-apf-metrics branch May 25, 2022 20:55
@MikeSpreitzer MikeSpreitzer mentioned this pull request Jun 11, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wojtek-t wojtek-t wojtek-t left review comments

@dgrisonnet dgrisonnet dgrisonnet left review comments

Assignees

@wojtek-t wojtek-t

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/test cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. sig/testing Categorizes an issue or PR as relevant to SIG Testing. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@MikeSpreitzer @leilajal @wojtek-t @k8s-ci-robot @dgrisonnet