github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98990 from gjkim42/kubelet-pod-structured-logging

Browse Source 
Migrate `pkg/kubelet/pod,pleg` to structured logging
This commit is contained in:
Kubernetes Prow Robot 2021-02-16 20:03:05 -08:00 committed by GitHub
commit c0841211fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/pleg/generic.go
View File

@ -152,7 +152,7 @@ func generateEvents(podID types.UID, cid string, oldState, newState plegContaine
return nil return nil
} }
klog.V(4).Infof("GenericPLEG: %v/%v: %v -> %v", podID, cid, oldState, newState) klog.V(4).InfoS("GenericPLEG", "podUID", podID, "containerID", cid, "oldState", oldState, "newState", newState)
switch newState { switch newState {
case plegContainerRunning: case plegContainerRunning:
return []*PodLifecycleEvent{{ID: podID, Type: ContainerStarted, Data: cid}} return []*PodLifecycleEvent{{ID: podID, Type: ContainerStarted, Data: cid}}
@ -188,7 +188,7 @@ func (g *GenericPLEG) updateRelistTime(timestamp time.Time) {
// relist queries the container runtime for list of pods/containers, compare // relist queries the container runtime for list of pods/containers, compare
// with the internal pods/containers, and generates events accordingly. // with the internal pods/containers, and generates events accordingly.
func (g *GenericPLEG) relist() { func (g *GenericPLEG) relist() {
klog.V(5).Infof("GenericPLEG: Relisting") klog.V(5).InfoS("GenericPLEG: Relisting")
if lastRelistTime := g.getRelistTime(); !lastRelistTime.IsZero() { if lastRelistTime := g.getRelistTime(); !lastRelistTime.IsZero() {
metrics.PLEGRelistInterval.Observe(metrics.SinceInSeconds(lastRelistTime)) metrics.PLEGRelistInterval.Observe(metrics.SinceInSeconds(lastRelistTime))
@ -202,7 +202,7 @@ func (g *GenericPLEG) relist() {
// Get all the pods. // Get all the pods.
podList, err := g.runtime.GetPods(true) podList, err := g.runtime.GetPods(true)
if err != nil { if err != nil {
klog.Errorf("GenericPLEG: Unable to retrieve pods: %v", err) klog.ErrorS(err, "GenericPLEG: Unable to retrieve pods")
return return
} }
@ -249,7 +249,7 @@ func (g *GenericPLEG) relist() {
// parallelize if needed. // parallelize if needed.
if err := g.updateCache(pod, pid); err != nil { if err := g.updateCache(pod, pid); err != nil {
// Rely on updateCache calling GetPodStatus to log the actual error. // Rely on updateCache calling GetPodStatus to log the actual error.
klog.V(4).Infof("PLEG: Ignoring events for pod %s/%s: %v", pod.Name, pod.Namespace, err) klog.V(4).ErrorS(err, "PLEG: Ignoring events for pod", "pod", klog.KRef(pod.Namespace, pod.Name))
// make sure we try to reinspect the pod during the next relisting // make sure we try to reinspect the pod during the next relisting
needsReinspection[pid] = pod needsReinspection[pid] = pod
@ -273,7 +273,7 @@ func (g *GenericPLEG) relist() {
case g.eventChannel <- events[i]: case g.eventChannel <- events[i]:
default: default:
metrics.PLEGDiscardEvents.Inc() metrics.PLEGDiscardEvents.Inc()
klog.Error("event channel is full, discard this relist() cycle event") klog.ErrorS(nil, "Event channel is full, discard this relist() cycle event")
} }
} }
} }
@ -281,11 +281,11 @@ func (g *GenericPLEG) relist() {
if g.cacheEnabled() { if g.cacheEnabled() {
// reinspect any pods that failed inspection during the previous relist // reinspect any pods that failed inspection during the previous relist
if len(g.podsToReinspect) > 0 { if len(g.podsToReinspect) > 0 {
klog.V(5).Infof("GenericPLEG: Reinspecting pods that previously failed inspection") klog.V(5).InfoS("GenericPLEG: Reinspecting pods that previously failed inspection")
for pid, pod := range g.podsToReinspect { for pid, pod := range g.podsToReinspect {
if err := g.updateCache(pod, pid); err != nil { if err := g.updateCache(pod, pid); err != nil {
// Rely on updateCache calling GetPodStatus to log the actual error. // Rely on updateCache calling GetPodStatus to log the actual error.
klog.V(5).Infof("PLEG: pod %s/%s failed reinspection: %v", pod.Name, pod.Namespace, err) klog.V(5).ErrorS(err, "PLEG: pod failed reinspection", "pod", klog.KRef(pod.Namespace, pod.Name))
needsReinspection[pid] = pod needsReinspection[pid] = pod
} }
} }
@ -374,7 +374,7 @@ func (g *GenericPLEG) updateCache(pod *kubecontainer.Pod, pid types.UID) error {
if pod == nil { if pod == nil {
// The pod is missing in the current relist. This means that // The pod is missing in the current relist. This means that
// the pod has no visible (active or inactive) containers. // the pod has no visible (active or inactive) containers.
klog.V(4).Infof("PLEG: Delete status for pod %q", string(pid)) klog.V(4).InfoS("PLEG: Delete status for pod", "podUID", string(pid))
g.cache.Delete(pid) g.cache.Delete(pid)
return nil return nil
} }
@ -383,7 +383,7 @@ func (g *GenericPLEG) updateCache(pod *kubecontainer.Pod, pid types.UID) error {
// GetPodStatus(pod *kubecontainer.Pod) so that Docker can avoid listing // GetPodStatus(pod *kubecontainer.Pod) so that Docker can avoid listing
// all containers again. // all containers again.
status, err := g.runtime.GetPodStatus(pod.ID, pod.Name, pod.Namespace) status, err := g.runtime.GetPodStatus(pod.ID, pod.Name, pod.Namespace)
klog.V(4).Infof("PLEG: Write status for %s/%s: %#v (err: %v)", pod.Name, pod.Namespace, status, err) klog.V(4).ErrorS(err, "PLEG: Write status", "pod", klog.KRef(pod.Namespace, pod.Name), "podStatus", status)
if err == nil { if err == nil {
// Preserve the pod IP across cache updates if the new IP is empty. // Preserve the pod IP across cache updates if the new IP is empty.
// When a pod is torn down, kubelet may race with PLEG and retrieve // When a pod is torn down, kubelet may race with PLEG and retrieve

6
pkg/kubelet/pod/mirror_client.go
View File

@ -119,17 +119,17 @@ func (mc *basicMirrorClient) DeleteMirrorPod(podFullName string, uid *types.UID)
} }
name, namespace, err := kubecontainer.ParsePodFullName(podFullName) name, namespace, err := kubecontainer.ParsePodFullName(podFullName)
if err != nil { if err != nil {
klog.Errorf("Failed to parse a pod full name %q", podFullName) klog.ErrorS(err, "Failed to parse a pod full name", "podFullName", podFullName)
return false, err return false, err
} }
klog.V(2).Infof("Deleting a mirror pod %q (uid %#v)", podFullName, uid) klog.V(2).InfoS("Deleting a mirror pod", "pod", klog.KRef(namespace, name), "podUID", uid)
var GracePeriodSeconds int64 var GracePeriodSeconds int64
if err := mc.apiserverClient.CoreV1().Pods(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{GracePeriodSeconds: &GracePeriodSeconds, Preconditions: &metav1.Preconditions{UID: uid}}); err != nil { if err := mc.apiserverClient.CoreV1().Pods(namespace).Delete(context.TODO(), name, metav1.DeleteOptions{GracePeriodSeconds: &GracePeriodSeconds, Preconditions: &metav1.Preconditions{UID: uid}}); err != nil {
// Unfortunately, there's no generic error for failing a precondition // Unfortunately, there's no generic error for failing a precondition
if !(apierrors.IsNotFound(err) || apierrors.IsConflict(err)) { if !(apierrors.IsNotFound(err) || apierrors.IsConflict(err)) {
// We should return the error here, but historically this routine does // We should return the error here, but historically this routine does
// not return an error unless it can't parse the pod name // not return an error unless it can't parse the pod name
klog.Errorf("Failed deleting a mirror pod %q: %v", podFullName, err) klog.ErrorS(err, "Failed deleting a mirror pod", "pod", klog.KRef(namespace, name))
} }
return false, nil return false, nil
} }