Skip to content

K
k3s
Commit 0bfaae16 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29118 from xiangpengzhao/fix_reversed_var_order

Automatic merge from submit-queue Fix reversed order of variables The order of variables in log is reversed.
parents be8abdab 48b5a582
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/dockertools/docker_manager.go
View file @ 0bfaae16
...@@ -1603,7 +1603,7 @@ func (dm *DockerManager) applyOOMScoreAdjIfNeeded(pod *api.Pod, container *api.C ...@@ -1603,7 +1603,7 @@ func (dm *DockerManager) applyOOMScoreAdjIfNeeded(pod *api.Pod, container *api.C
// If current api version is older than OOMScoreAdj requested, use the old way. // If current api version is older than OOMScoreAdj requested, use the old way.
if result < 0 { if result < 0 {
if err := dm.applyOOMScoreAdj(pod, container, containerInfo); err != nil { if err := dm.applyOOMScoreAdj(pod, container, containerInfo); err != nil {
return fmt.Errorf("Failed to apply oom-score-adj to container %q- %v", err, containerInfo.Name) return fmt.Errorf("Failed to apply oom-score-adj to container %q- %v", containerInfo.Name, err)
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment