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

Single sync error.

Browse source
This commit is contained in:
Prashanth Balasubramanian 2016-03-26 14:15:07 -07:00
parent 5b2de6e40b
commit ba26bcabf5
1 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -265,6 +265,9 @@ func (lbc *LoadBalancerController) sync(key string) {
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
// 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"
@ -276,29 +279,34 @@ func (lbc *LoadBalancerController) sync(key string) {
} else { } else {
err = fmt.Errorf("%v Error: %v", eventMsg, err) err = fmt.Errorf("%v Error: %v", eventMsg, err)
} }
lbc.ingQueue.requeue(key, err) syncError = err
return
} }
if !ingExists { if !ingExists {
if syncError != nil {
lbc.ingQueue.requeue(key, err)
}
return return
} }
// 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 {
lbc.ingQueue.requeue(key, err) lbc.ingQueue.requeue(key, fmt.Errorf("%v, unable to get loadbalancer: %v", syncError, err))
return return
} }
ing := *obj.(*extensions.Ingress) ing := *obj.(*extensions.Ingress)
if urlMap, err := lbc.tr.toUrlMap(&ing); err != nil { if urlMap, err := lbc.tr.toUrlMap(&ing); err != nil {
lbc.ingQueue.requeue(key, err) syncError = fmt.Errorf("%v, convert to url map error %v", syncError, err)
} else if err := l7.UpdateUrlMap(urlMap); err != nil { } else if err := l7.UpdateUrlMap(urlMap); err != nil {
lbc.recorder.Eventf(&ing, api.EventTypeWarning, "UrlMap", err.Error()) lbc.recorder.Eventf(&ing, api.EventTypeWarning, "UrlMap", err.Error())
lbc.ingQueue.requeue(key, err) syncError = fmt.Errorf("%v, update url map error: %v", syncError, err)
} else if lbc.updateIngressStatus(l7, ing); err != nil { } else if lbc.updateIngressStatus(l7, ing); err != nil {
lbc.recorder.Eventf(&ing, api.EventTypeWarning, "Status", err.Error()) lbc.recorder.Eventf(&ing, api.EventTypeWarning, "Status", err.Error())
lbc.ingQueue.requeue(key, err) syncError = fmt.Errorf("%v, update ingress error: %v", syncError, err)
}
if syncError != nil {
lbc.ingQueue.requeue(key, syncError)
} }
return return
} }