Merge pull request #56405 from shyamjvs/improve-error-handling-cidr-allocator

Automatic merge from submit-queue (batch tested with PRs 56094, 52910, 55953, 56405, 56415). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Requeue failed updates for retry in CIDR allocator Split from https://github.com/kubernetes/kubernetes/pull/56352 Ref https://github.com/kubernetes/kubernetes/issues/52292 /cc @wojtek-t /kind bug /priority critical-urgent ```release-note NONE ``` cc @kubernetes/sig-network-misc

Merge pull request #56405 from shyamjvs/improve-error-handling-cidr-allocator
1ee9d205 · Kubernetes Submit Queue · GitHub · b8b6f479 · 02a7e92b · 1ee9d205
Unverified Commit 1ee9d205 authored Nov 27, 2017 by Kubernetes Submit Queue Committed by GitHub Nov 27, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 2 deletions

cloud_cidr_allocator.go pkg/controller/node/ipam/cloud_cidr_allocator.go +4 -1

range_allocator.go pkg/controller/node/ipam/range_allocator.go +4 -1

No files found.
--- a/pkg/controller/node/ipam/cloud_cidr_allocator.go
+++ b/pkg/controller/node/ipam/cloud_cidr_allocator.go
@@ -146,7 +146,10 @@ func (ca *cloudCIDRAllocator) worker(stopChan <-chan struct{}) {
 				glog.Warning("Channel nodeCIDRUpdateChannel was unexpectedly closed")
 				return
 			}
-			ca.updateCIDRAllocation(workItem)
+			if err := ca.updateCIDRAllocation(workItem); err != nil {
+				// Requeue the failed node for update again.
+				ca.nodeUpdateChannel <- workItem
+			}
 		case <-stopChan:
 			return
 		}

--- a/pkg/controller/node/ipam/range_allocator.go
+++ b/pkg/controller/node/ipam/range_allocator.go
@@ -176,7 +176,10 @@ func (r *rangeAllocator) worker(stopChan <-chan struct{}) {
 				glog.Warning("Channel nodeCIDRUpdateChannel was unexpectedly closed")
 				return
 			}
-			r.updateCIDRAllocation(workItem)
+			if err := r.updateCIDRAllocation(workItem); err != nil {
+				// Requeue the failed node for update again.
+				r.nodeCIDRUpdateChannel <- workItem
+			}
 		case <-stopChan:
 			return
 		}