mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-29 06:27:05 +00:00
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.
This commit is contained in:
commit
0bfaae16a0
@ -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 result < 0 {
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user