DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[GLBC] Fix problem surfacing error (#658)

Browse source 
* use syncError in defer GC

* surface other err as well
This commit is contained in:
Nick Sardo 2017-04-26 15:30:33 -07:00 committed by GitHub
parent 31e9746df4
commit e7ceb014f8
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
controllers/gce/controller/controller.go
View file

@ -294,16 +294,16 @@ func (lbc *LoadBalancerController) sync(key string) (err error) {
// successful GC we know that there are no dangling cloud resources that // successful GC we know that there are no dangling cloud resources that
// don't have an associated Kubernetes Ingress/Service/Endpoint. // don't have an associated Kubernetes Ingress/Service/Endpoint.
var syncError error
defer func() { defer func() {
if deferErr := lbc.CloudClusterManager.GC(lbNames, nodePorts); deferErr != nil { 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) glog.V(3).Infof("Finished syncing %v", key)
}() }()
// Record any errors during sync and throw a single error at the end. This // Record any errors during sync and throw a single error at the end. This
// allows us to free up associated cloud resources ASAP. // allows us to free up associated cloud resources ASAP.
var syncError error
if err := lbc.CloudClusterManager.Checkpoint(lbs, nodeNames, nodePorts); err != nil { if err := lbc.CloudClusterManager.Checkpoint(lbs, nodeNames, nodePorts); err != nil {
// TODO: Implement proper backoff for the queue. // TODO: Implement proper backoff for the queue.
eventMsg := "GCE" eventMsg := "GCE"
@ -324,7 +324,8 @@ func (lbc *LoadBalancerController) sync(key string) (err error) {
// Update the UrlMap of the single loadbalancer that came through the watch. // Update the UrlMap of the single loadbalancer that came through the watch.
l7, err := lbc.CloudClusterManager.l7Pool.Get(key) l7, err := lbc.CloudClusterManager.l7Pool.Get(key)
if err != nil { if err != nil {
return fmt.Errorf("%v, unable to get loadbalancer: %v", syncError, err) syncError = fmt.Errorf("%v, unable to get loadbalancer: %v", syncError, err)
return syncError
} }
ing := *obj.(*extensions.Ingress) ing := *obj.(*extensions.Ingress)