scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Namespace controller error handling improvements

Browse Source
This commit is contained in:
derekwaynecarr
2016-02-26 13:06:27 -05:00
parent 649b6879d7
commit a301a2565e
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/controller/namespace/namespace_controller.go
View File

@@ -112,11 +112,16 @@ func (nm *NamespaceController) worker() {
if err := nm.syncNamespaceFromKey(key.(string)); err != nil { if err := nm.syncNamespaceFromKey(key.(string)); err != nil {
if estimate, ok := err.(*contentRemainingError); ok { if estimate, ok := err.(*contentRemainingError); ok {
go func() { go func() {
defer utilruntime.HandleCrash()
t := estimate.Estimate/2 + 1 t := estimate.Estimate/2 + 1
glog.V(4).Infof("Content remaining in namespace %s, waiting %d seconds", key, t) glog.V(4).Infof("Content remaining in namespace %s, waiting %d seconds", key, t)
time.Sleep(time.Duration(t) * time.Second) time.Sleep(time.Duration(t) * time.Second)
nm.queue.Add(key) nm.queue.Add(key)
}() }()
} else {
// rather than wait for a full resync, re-add the namespace to the queue to be processed
nm.queue.Add(key)
utilruntime.HandleError(err)
} }
} }
}() }()

6
pkg/controller/namespace/namespace_controller_utils.go
View File

@@ -244,6 +244,12 @@ func syncNamespace(kubeClient clientset.Interface, versions *unversioned.APIVers
// we have removed content, so mark it finalized by us // we have removed content, so mark it finalized by us
result, err := retryOnConflictError(kubeClient, namespace, finalizeNamespaceFunc) result, err := retryOnConflictError(kubeClient, namespace, finalizeNamespaceFunc)
if err != nil { if err != nil {
// in normal practice, this should not be possible, but if a deployment is running
// two controllers to do namespace deletion that share a common finalizer token it's
// possible that a not found could occur since the other controller would have finished the delete.
if errors.IsNotFound(err) {
return nil
}
return err return err
} }