mirror of https://github.com/k3s-io/k3s
Merge pull request #55020 from derekwaynecarr/fix-spam
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. StopPodSandbox should not log when container is already removed **What this PR does / why we need it**: StopPodSandbox should not log when a container is already gone. It should only log if it could not stop and the container was still present. Fixes https://github.com/kubernetes/kubernetes/issues/55021 **Special notes for your reviewer**: This was seen in our production logs, need to eliminate spam. **Release note**: ```release-note NONE ```pull/6/head
commit
0575f72832
|
@ -239,9 +239,9 @@ func (ds *dockerService) StopPodSandbox(podSandboxID string) error {
|
|||
}
|
||||
}
|
||||
if err := ds.client.StopContainer(podSandboxID, defaultSandboxGracePeriod); err != nil {
|
||||
glog.Errorf("Failed to stop sandbox %q: %v", podSandboxID, err)
|
||||
// Do not return error if the container does not exist
|
||||
if !libdocker.IsContainerNotFoundError(err) {
|
||||
glog.Errorf("Failed to stop sandbox %q: %v", podSandboxID, err)
|
||||
errList = append(errList, err)
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue