Merge pull request #13 from wongma7/threshold

Allow disabling of failure thresholds
kubernetes-sigs · Jan 17, 2019 · 2823a0b · 2823a0b
2 parents 9bdb352 + 8927742
commit 2823a0b
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/controller/controller.go b/controller/controller.go
@@ -289,7 +289,7 @@ func CreateProvisionedPVBackoff(backoff wait.Backoff) func(*ProvisionController)
 }
 
 // FailedProvisionThreshold is the threshold for max number of retries on
-// failures of Provision. Defaults to 15.
+// failures of Provision. Set to 0 to retry indefinitely. Defaults to 15.
 func FailedProvisionThreshold(failedProvisionThreshold int) func(*ProvisionController) error {
 	return func(c *ProvisionController) error {
 		if c.HasRun() {
@@ -301,7 +301,7 @@ func FailedProvisionThreshold(failedProvisionThreshold int) func(*ProvisionContr
 }
 
 // FailedDeleteThreshold is the threshold for max number of retries on failures
-// of Delete. Defaults to 15.
+// of Delete. Set to 0 to retry indefinitely. Defaults to 15.
 func FailedDeleteThreshold(failedDeleteThreshold int) func(*ProvisionController) error {
 	return func(c *ProvisionController) error {
 		if c.HasRun() {
@@ -746,7 +746,10 @@ func (ctrl *ProvisionController) processNextClaimWorkItem() bool {
 		}
 
 		if err := ctrl.syncClaimHandler(key); err != nil {
-			if ctrl.claimQueue.NumRequeues(obj) < ctrl.failedProvisionThreshold {
+			if ctrl.failedProvisionThreshold == 0 {
+				glog.Warningf("Retrying syncing claim %q, failure %v", key, ctrl.claimQueue.NumRequeues(obj))
+				ctrl.claimQueue.AddRateLimited(obj)
+			} else if ctrl.claimQueue.NumRequeues(obj) < ctrl.failedProvisionThreshold {
 				glog.Warningf("Retrying syncing claim %q because failures %v < threshold %v", key, ctrl.claimQueue.NumRequeues(obj), ctrl.failedProvisionThreshold)
 				ctrl.claimQueue.AddRateLimited(obj)
 			} else {
@@ -787,11 +790,14 @@ func (ctrl *ProvisionController) processNextVolumeWorkItem() bool {
 		}
 
 		if err := ctrl.syncVolumeHandler(key); err != nil {
-			if ctrl.volumeQueue.NumRequeues(obj) < ctrl.failedDeleteThreshold {
-				glog.Warningf("Retrying syncing volume %q because failures %v < threshold %v", key, ctrl.volumeQueue.NumRequeues(obj), ctrl.failedProvisionThreshold)
+			if ctrl.failedDeleteThreshold == 0 {
+				glog.Warningf("Retrying syncing volume %q, failure %v", key, ctrl.volumeQueue.NumRequeues(obj))
+				ctrl.volumeQueue.AddRateLimited(obj)
+			} else if ctrl.volumeQueue.NumRequeues(obj) < ctrl.failedDeleteThreshold {
+				glog.Warningf("Retrying syncing volume %q because failures %v < threshold %v", key, ctrl.volumeQueue.NumRequeues(obj), ctrl.failedDeleteThreshold)
 				ctrl.volumeQueue.AddRateLimited(obj)
 			} else {
-				glog.Errorf("Giving up syncing volume %q because failures %v >= threshold %v", key, ctrl.volumeQueue.NumRequeues(obj), ctrl.failedProvisionThreshold)
+				glog.Errorf("Giving up syncing volume %q because failures %v >= threshold %v", key, ctrl.volumeQueue.NumRequeues(obj), ctrl.failedDeleteThreshold)
 				// Done but do not Forget: it will not be in the queue but NumRequeues
 				// will be saved until the obj is deleted from kubernetes
 			}