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

Preserve legacy inflight metrics and fixes registration #88609

Merged
merged 3 commits into from Mar 2, 2020
Merged

Preserve legacy inflight metrics and fixes registration #88609

merged 3 commits into from Mar 2, 2020

Conversation

yue9944882
Copy link
Member

/sig api-machinery
/kind feature

NONE

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

@k8s-ci-robot k8s-ci-robot added 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Feb 27, 2020
@yue9944882 yue9944882 mentioned this pull request Feb 27, 2020
Merged
@k8s-ci-robot k8s-ci-robot added the area/dependency Issues or PRs related to dependency changes label Feb 27, 2020
@RainbowMango
Copy link
Member

Can you add a Fixes #88426 to the PR descriptions?
I see you have fixed all items in #88426.

@RainbowMango RainbowMango mentioned this pull request Feb 27, 2020
Closed
MikeSpreitzer
MikeSpreitzer reviewed Feb 27, 2020
View reviewed changes
Copy link
Member

@MikeSpreitzer MikeSpreitzer left a comment

Choose a reason for hiding this comment

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

I would say that the change here is not "fixes registration" but rather "uses the standard metrics abstraction instead of going directly to Prometheus".

staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness.go Outdated
@@ -57,6 +55,8 @@ func GetClassification(ctx context.Context) *PriorityAndFairnessClassification {
return ctx.Value(priorityAndFairnessKey).(*PriorityAndFairnessClassification)
}

var atomicMutatingLen, atomicNonMutatingLen = atomic.NewInt32(0), atomic.NewInt32(0)
Copy link
Member

Choose a reason for hiding this comment

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

Why use a third party package (go.uber.org/atomic) when we can get the functionality we are using here from sync/atomic?

@lavalamp
Copy link
Member

/assign @logicalhan

@MikeSpreitzer
Copy link
Member

@MikeSpreitzer

logicalhan
logicalhan approved these changes Feb 28, 2020
View reviewed changes
Copy link
Member

@logicalhan logicalhan left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 28, 2020
@logicalhan
Copy link
Member

Need to run golint though.

@MikeSpreitzer
Copy link
Member

And we agreed to replace the use of uber's atomic with golang's atomic.

@MikeSpreitzer
Copy link
Member

MikeSpreitzer commented Mar 1, 2020 •
edited

@yue9944882 : you have just a couple of tiny things to do here.

As far as I can tell, the import statement that golint complained about can simply be deleted.

See MikeSpreitzer@52c1ee5 . I tested that, and it seems to work.

@MikeSpreitzer MikeSpreitzer mentioned this pull request Mar 2, 2020
Merged
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 2, 2020
MikeSpreitzer
MikeSpreitzer approved these changes Mar 2, 2020
View reviewed changes
Copy link
Member

@MikeSpreitzer MikeSpreitzer left a comment

Choose a reason for hiding this comment

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

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 2, 2020
@MikeSpreitzer
Copy link
Member

/assign @lavalamp

@MikeSpreitzer
Copy link
Member

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Mar 2, 2020
@MikeSpreitzer
Copy link
Member

/retest

@lavalamp
Copy link
Member

lavalamp commented Mar 2, 2020

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lavalamp, yue9944882

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 2, 2020
@k8s-ci-robot k8s-ci-robot merged commit d115206 into kubernetes:master Mar 2, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Mar 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@logicalhan logicalhan logicalhan approved these changes

@MikeSpreitzer MikeSpreitzer MikeSpreitzer approved these changes

@enj enj Awaiting requested review from enj

@sttts sttts Awaiting requested review from sttts

Assignees

@lavalamp lavalamp

@logicalhan logicalhan

@MikeSpreitzer MikeSpreitzer

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/apiserver area/dependency Issues or PRs related to dependency changes cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. 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. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@yue9944882 @RainbowMango @lavalamp @MikeSpreitzer @logicalhan @k8s-ci-robot