From 2b5a655a5d87027b5e8d2612a92624132c077114 Mon Sep 17 00:00:00 2001 From: zhengguoyong Date: Wed, 25 Nov 2015 10:54:27 +0800 Subject: [PATCH] check ref before use it --- pkg/kubelet/kubelet.go | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index a1a5ca6fe1d..b75a68d4247 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -1626,18 +1626,15 @@ func (kl *Kubelet) syncPod(pod *api.Pod, mirrorPod *api.Pod, runningPod kubecont return err } - // Starting phase: - ref, err := api.GetReference(pod) - if err != nil { - glog.Errorf("Couldn't make a ref to pod %q: '%v'", podFullName, err) - } - // Mount volumes. podVolumes, err := kl.mountExternalVolumes(pod) if err != nil { - kl.recorder.Eventf(ref, api.EventTypeWarning, kubecontainer.FailedMountVolume, "Unable to mount volumes for pod %q: %v", podFullName, err) - glog.Errorf("Unable to mount volumes for pod %q: %v; skipping pod", podFullName, err) - return err + ref, errGetRef := api.GetReference(pod) + if errGetRef == nil && ref != nil { + kl.recorder.Eventf(ref, api.EventTypeWarning, kubecontainer.FailedMountVolume, "Unable to mount volumes for pod %q: %v", podFullName, err) + glog.Errorf("Unable to mount volumes for pod %q: %v; skipping pod", podFullName, err) + return err + } } kl.volumeManager.SetVolumes(pod.UID, podVolumes)