From 334cc366beb4783559d311330b634164562e8ad7 Mon Sep 17 00:00:00 2001 From: Nick Sardo Date: Wed, 26 Apr 2017 14:34:54 -0700 Subject: [PATCH] use syncError in defer GC --- controllers/gce/controller/controller.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/controllers/gce/controller/controller.go b/controllers/gce/controller/controller.go index d3e4772ec..50ecf9dd2 100644 --- a/controllers/gce/controller/controller.go +++ b/controllers/gce/controller/controller.go @@ -294,16 +294,16 @@ func (lbc *LoadBalancerController) sync(key string) (err error) { // successful GC we know that there are no dangling cloud resources that // don't have an associated Kubernetes Ingress/Service/Endpoint. + var syncError error defer func() { if deferErr := lbc.CloudClusterManager.GC(lbNames, nodePorts); deferErr != nil { - err = fmt.Errorf("error during sync %v, error during GC %v", err, deferErr) + err = fmt.Errorf("error during sync %v, error during GC %v", syncError, deferErr) } glog.V(3).Infof("Finished syncing %v", key) }() // Record any errors during sync and throw a single error at the end. This // allows us to free up associated cloud resources ASAP. - var syncError error if err := lbc.CloudClusterManager.Checkpoint(lbs, nodeNames, nodePorts); err != nil { // TODO: Implement proper backoff for the queue. eventMsg := "GCE"