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

Merge pull request #29162 from xiangpengzhao/fix_err_to_cerr

Browse Source 
Automatic merge from submit-queue

Fix wrong variable of error

Should not log `err` but `cerr`.
This commit is contained in:
k8s-merge-robot 2016-07-20 11:11:33 -07:00 committed by GitHub
commit 6df62ff39c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/dockertools/docker_manager.go
View File

@ -1332,7 +1332,7 @@ func (dm *DockerManager) KillContainerInPod(containerID kubecontainer.ContainerI
} }
storedPod, storedContainer, cerr := containerAndPodFromLabels(inspect) storedPod, storedContainer, cerr := containerAndPodFromLabels(inspect)
if cerr != nil { if cerr != nil {
glog.Errorf("unable to access pod data from container: %v", err) glog.Errorf("unable to access pod data from container: %v", cerr)
} }
if container == nil { if container == nil {
container = storedContainer container = storedContainer