From 026638af519454ddea1d40342d161d5a7e36f2e3 Mon Sep 17 00:00:00 2001 From: zhangxiaoyu-zidif Date: Fri, 28 Apr 2017 18:16:19 +0800 Subject: [PATCH] stateful_pod_control.go: format the code --- pkg/controller/statefulset/stateful_pod_control.go | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkg/controller/statefulset/stateful_pod_control.go b/pkg/controller/statefulset/stateful_pod_control.go index 4abdf3decf0..2b80901966c 100644 --- a/pkg/controller/statefulset/stateful_pod_control.go +++ b/pkg/controller/statefulset/stateful_pod_control.go @@ -112,18 +112,17 @@ func (spc *realStatefulPodControl) UpdateStatefulPod(set *apps.StatefulSet, pod return err } } - // if the Pod is not dirty do nothing + // if the Pod is not dirty, do nothing if consistent { return nil } attemptedUpdate = true // commit the update, retrying on conflicts - _, err := spc.client.Core().Pods(set.Namespace).Update(pod) - if err == nil { + _, updateErr := spc.client.Core().Pods(set.Namespace).Update(pod) + if updateErr == nil { return nil } - updateErr := err if updated, err := spc.podLister.Pods(set.Namespace).Get(pod.Name); err == nil { // make a copy so we don't mutate the shared cache @@ -154,13 +153,11 @@ func (spc *realStatefulPodControl) UpdateStatefulSetStatus(set *apps.StatefulSet return retry.RetryOnConflict(retry.DefaultBackoff, func() error { set.Status.Replicas = replicas set.Status.ObservedGeneration = &generation - _, err := spc.client.Apps().StatefulSets(set.Namespace).UpdateStatus(set) - if err == nil { + _, updateErr := spc.client.Apps().StatefulSets(set.Namespace).UpdateStatus(set) + if updateErr == nil { return nil } - updateErr := err - if updated, err := spc.setLister.StatefulSets(set.Namespace).Get(set.Name); err == nil { // make a copy so we don't mutate the shared cache if copy, err := scheme.Scheme.DeepCopy(updated); err == nil {