github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-01 07:47:56 +00:00
Code Issues Projects Releases Wiki Activity

Migrate kuberuntime_gc.go to structured logs

Browse Source
This commit is contained in:
Elana Hashman 2021-03-12 14:03:22 -08:00
parent fcee7a0105
commit 1c95d63df0
No known key found for this signature in database
GPG Key ID: D37F7B2A20B48FA0
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkg/kubelet/kuberuntime/kuberuntime_gc.go
View File

@ -138,12 +138,12 @@ func (cgc *containerGC) removeOldestN(containers []containerGCInfo, toRemove int
} }
message := "Container is in unknown state, try killing it before removal" message := "Container is in unknown state, try killing it before removal"
if err := cgc.manager.killContainer(nil, id, containers[i].name, message, reasonUnknown, nil); err != nil { if err := cgc.manager.killContainer(nil, id, containers[i].name, message, reasonUnknown, nil); err != nil {
klog.Errorf("Failed to stop container %q: %v", containers[i].id, err) klog.ErrorS(err, "Failed to stop container", "containerID", containers[i].id)
continue continue
} }
} }
if err := cgc.manager.removeContainer(containers[i].id); err != nil { if err := cgc.manager.removeContainer(containers[i].id); err != nil {
klog.Errorf("Failed to remove container %q: %v", containers[i].id, err) klog.ErrorS(err, "Failed to remove container", "containerID", containers[i].id)
} }
} }
@ -168,16 +168,16 @@ func (cgc *containerGC) removeOldestNSandboxes(sandboxes []sandboxGCInfo, toRemo
// removeSandbox removes the sandbox by sandboxID. // removeSandbox removes the sandbox by sandboxID.
func (cgc *containerGC) removeSandbox(sandboxID string) { func (cgc *containerGC) removeSandbox(sandboxID string) {
klog.V(4).Infof("Removing sandbox %q", sandboxID) klog.V(4).InfoS("Removing sandbox", "sandboxID", sandboxID)
// In normal cases, kubelet should've already called StopPodSandbox before // In normal cases, kubelet should've already called StopPodSandbox before
// GC kicks in. To guard against the rare cases where this is not true, try // GC kicks in. To guard against the rare cases where this is not true, try
// stopping the sandbox before removing it. // stopping the sandbox before removing it.
if err := cgc.client.StopPodSandbox(sandboxID); err != nil { if err := cgc.client.StopPodSandbox(sandboxID); err != nil {
klog.Errorf("Failed to stop sandbox %q before removing: %v", sandboxID, err) klog.ErrorS(err, "Failed to stop sandbox before removing", "sandboxID", sandboxID)
return return
} }
if err := cgc.client.RemovePodSandbox(sandboxID); err != nil { if err := cgc.client.RemovePodSandbox(sandboxID); err != nil {
klog.Errorf("Failed to remove sandbox %q: %v", sandboxID, err) klog.ErrorS(err, "Failed to remove sandbox", "sandboxID", sandboxID)
} }
} }
@ -342,7 +342,7 @@ func (cgc *containerGC) evictPodLogsDirectories(allSourcesReady bool) error {
} }
err := osInterface.RemoveAll(filepath.Join(podLogsRootDirectory, name)) err := osInterface.RemoveAll(filepath.Join(podLogsRootDirectory, name))
if err != nil { if err != nil {
klog.Errorf("Failed to remove pod logs directory %q: %v", name, err) klog.ErrorS(err, "Failed to remove pod logs directory", "path", name)
} }
} }
} }
@ -357,7 +357,7 @@ func (cgc *containerGC) evictPodLogsDirectories(allSourcesReady bool) error {
if err != nil { if err != nil {
// TODO: we should handle container not found (i.e. container was deleted) case differently // TODO: we should handle container not found (i.e. container was deleted) case differently
// once https://github.com/kubernetes/kubernetes/issues/63336 is resolved // once https://github.com/kubernetes/kubernetes/issues/63336 is resolved
klog.Infof("Error getting ContainerStatus for containerID %q: %v", containerID, err) klog.InfoS("Error getting ContainerStatus for containerID", "containerID", containerID, "err", err)
} else if status.State != runtimeapi.ContainerState_CONTAINER_EXITED { } else if status.State != runtimeapi.ContainerState_CONTAINER_EXITED {
// Here is how container log rotation works (see containerLogManager#rotateLatestLog): // Here is how container log rotation works (see containerLogManager#rotateLatestLog):
// //
@ -370,17 +370,17 @@ func (cgc *containerGC) evictPodLogsDirectories(allSourcesReady bool) error {
// See https://github.com/kubernetes/kubernetes/issues/52172 // See https://github.com/kubernetes/kubernetes/issues/52172
// //
// We only remove unhealthy symlink for dead containers // We only remove unhealthy symlink for dead containers
klog.V(5).Infof("Container %q is still running, not removing symlink %q.", containerID, logSymlink) klog.V(5).InfoS("Container is still running, not removing symlink", "containerID", containerID, "path", logSymlink)
continue continue
} }
} else { } else {
klog.V(4).Infof("unable to obtain container Id: %v", err) klog.V(4).InfoS("Unable to obtain container ID", "err", err)
} }
err := osInterface.Remove(logSymlink) err := osInterface.Remove(logSymlink)
if err != nil { if err != nil {
klog.Errorf("Failed to remove container log dead symlink %q: %v", logSymlink, err) klog.ErrorS(err, "Failed to remove container log dead symlink", "path", logSymlink)
} else { } else {
klog.V(4).Infof("removed symlink %s", logSymlink) klog.V(4).InfoS("Removed symlink", "path", logSymlink)
} }
} }
} }