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

Migrate pkg/kubelet/cm/cpumanage/{topology/togit pology.go, policy_none.go, cpu_assignment.go} to structured logging #100163

Merged
merged 1 commit into from Mar 16, 2021

Conversation

lala123912
Copy link
Contributor

@lala123912 lala123912 commented Mar 12, 2021

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Which issue(s) this PR fixes:

Part of #98976

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

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

- [KEP]: https://github.com/kubernetes/enhancements/tree/master/keps/sig-instrumentation/1602-structured-logging

/sig node instrumentation
/priority important-soon

@k8s-ci-robot k8s-ci-robot added release-note kind/cleanup size/S sig/node sig/instrumentation priority/important-soon cncf-cla: yes needs-triage labels Mar 12, 2021
@k8s-ci-robot k8s-ci-robot requested review from klueska and yifan-gu Mar 12, 2021
@lala123912
Copy link
Contributor Author

@lala123912 lala123912 commented Mar 12, 2021

/ok-to-test
/cc @ehashman

@k8s-ci-robot k8s-ci-robot requested a review from ehashman Mar 12, 2021
@k8s-ci-robot k8s-ci-robot added ok-to-test area/kubelet labels Mar 12, 2021
@serathius
Copy link
Contributor

@serathius serathius commented Mar 12, 2021

/assign @ConnorDoyle
/lgtm
/milestone v1.21

@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 12, 2021
@k8s-ci-robot k8s-ci-robot added the lgtm label Mar 12, 2021
@ehashman ehashman added this to Triage in SIG Node PR Triage Mar 12, 2021
Copy link
Member

@ehashman ehashman left a comment

Very close, thanks!

/triage accepted

@@ -236,8 +236,7 @@ func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) {
}
}
} else {
klog.Errorf("could not get unique coreID for socket: %d core %d threads: %v",
core.SocketID, core.Id, core.Threads)
klog.InfoS("Could not get unique coreID for socket", "socket", core.SocketID, "core", core.Id, "threads", core.Threads)
Copy link
Member

@ehashman ehashman Mar 12, 2021

Choose a reason for hiding this comment

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

Suggested change
klog.InfoS("Could not get unique coreID for socket", "socket", core.SocketID, "core", core.Id, "threads", core.Threads)
klog.ErrorS(nil, "Could not get unique coreID for socket", "socket", core.SocketID, "core", core.Id, "threads", core.Threads)

Copy link
Contributor Author

@lala123912 lala123912 Mar 15, 2021

Choose a reason for hiding this comment

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

Update to ErrorS.

@@ -190,7 +190,7 @@ func takeByTopology(topo *topology.CPUTopology, availableCPUs cpuset.CPUSet, num
// on the same sockets as the whole cores we have already taken in this
// allocation.
for _, c := range acc.freeCPUs() {
klog.V(4).Infof("[cpumanager] takeByTopology: claiming CPU [%d]", c)
klog.V(4).InfoS("takeByTopology: claiming CPU", "CPU", c)
Copy link
Member

@ehashman ehashman Mar 12, 2021

Choose a reason for hiding this comment

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

Suggested change
klog.V(4).InfoS("takeByTopology: claiming CPU", "CPU", c)
klog.V(4).InfoS("takeByTopology: claiming CPU", "cpu", c)

Copy link
Contributor Author

@lala123912 lala123912 Mar 15, 2021

Choose a reason for hiding this comment

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

Use cpu instead now. Could you review it all again, pls?@ehashman

@k8s-ci-robot k8s-ci-robot added triage/accepted and removed needs-triage labels Mar 12, 2021
@ehashman
Copy link
Member

@ehashman ehashman commented Mar 12, 2021

/lgtm cancel

because we accidentally turned an Errorf into an InfoS, should be ErrorS

@ehashman ehashman moved this from Triage to Waiting on Author in SIG Node PR Triage Mar 12, 2021
@ehashman ehashman moved this from Needs Reviewer to Waiting on Author in Structured Logging Migration for Kubelet, 1.21 Mar 12, 2021
@k8s-ci-robot k8s-ci-robot removed the lgtm label Mar 12, 2021
@@ -236,8 +236,7 @@ func Discover(machineInfo *cadvisorapi.MachineInfo) (*CPUTopology, error) {
}
}
} else {
klog.Errorf("could not get unique coreID for socket: %d core %d threads: %v",
core.SocketID, core.Id, core.Threads)
klog.ErrorS(nil, "Could not get unique coreID for socket", "socket", core.SocketID, "core", core.Id, "threads", core.Threads)
Copy link
Contributor

@shubheksha shubheksha Mar 15, 2021

Choose a reason for hiding this comment

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

Suggested change
klog.ErrorS(nil, "Could not get unique coreID for socket", "socket", core.SocketID, "core", core.Id, "threads", core.Threads)
klog.ErrorS(nil, "Could not get unique coreID for socket", "socketID", core.SocketID, "coreID", core.Id, "threads", core.Threads)

Copy link
Member

@ehashman ehashman Mar 15, 2021

Choose a reason for hiding this comment

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

I don't think this is consistent, we should leave this as is.

Copy link
Member

@ehashman ehashman left a comment

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm label Mar 15, 2021
@ehashman ehashman moved this from Waiting on Author to Needs Approver in SIG Node PR Triage Mar 15, 2021
@ehashman ehashman moved this from Waiting on Author to Needs Approver in Structured Logging Migration for Kubelet, 1.21 Mar 15, 2021
@mrunalp mrunalp moved this from Needs Approver to Done in SIG Node PR Triage Mar 16, 2021
@k8s-ci-robot
Copy link
Contributor

@k8s-ci-robot k8s-ci-robot commented Mar 16, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lala123912, mrunalp

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 label Mar 16, 2021
@ehashman ehashman moved this from Needs Approver to Done in Structured Logging Migration for Kubelet, 1.21 Mar 16, 2021
@k8s-ci-robot k8s-ci-robot merged commit 1d4777b into kubernetes:master Mar 16, 2021
14 checks passed
@k8s-ci-robot k8s-ci-robot added release-note-none and removed release-note labels Mar 29, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved area/kubelet cncf-cla: yes kind/cleanup lgtm ok-to-test priority/important-soon release-note-none sig/instrumentation sig/node size/S triage/accepted
Development

Successfully merging this pull request may close these issues.

None yet

7 participants