Commit 3950f325 authored by Ke Zhang's avatar Ke Zhang

two nits for kubelet syncPod

parent 70d6fe6d
...@@ -1559,7 +1559,7 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error { ...@@ -1559,7 +1559,7 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
} }
// Latency measurements for the main workflow are relative to the // Latency measurements for the main workflow are relative to the
// (first time the pod was seen by the API server. // first time the pod was seen by the API server.
var firstSeenTime time.Time var firstSeenTime time.Time
if firstSeenTimeStr, ok := pod.Annotations[kubetypes.ConfigFirstSeenAnnotationKey]; ok { if firstSeenTimeStr, ok := pod.Annotations[kubetypes.ConfigFirstSeenAnnotationKey]; ok {
firstSeenTime = kubetypes.ConvertToTimestamp(firstSeenTimeStr).Get() firstSeenTime = kubetypes.ConvertToTimestamp(firstSeenTimeStr).Get()
...@@ -1612,7 +1612,7 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error { ...@@ -1612,7 +1612,7 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
if mirrorPod.DeletionTimestamp != nil || !kl.podManager.IsMirrorPodOf(mirrorPod, pod) { if mirrorPod.DeletionTimestamp != nil || !kl.podManager.IsMirrorPodOf(mirrorPod, pod) {
// The mirror pod is semantically different from the static pod. Remove // The mirror pod is semantically different from the static pod. Remove
// it. The mirror pod will get recreated later. // it. The mirror pod will get recreated later.
glog.Errorf("Deleting mirror pod %q because it is outdated", format.Pod(mirrorPod)) glog.Warningf("Deleting mirror pod %q because it is outdated", format.Pod(mirrorPod))
if err := kl.podManager.DeleteMirrorPod(podFullName); err != nil { if err := kl.podManager.DeleteMirrorPod(podFullName); err != nil {
glog.Errorf("Failed deleting mirror pod %q: %v", format.Pod(mirrorPod), err) glog.Errorf("Failed deleting mirror pod %q: %v", format.Pod(mirrorPod), err)
} else { } else {
......
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