Merge pull request #494 from mdzraf/removeSlowSet

Removing Slowset Utility

Author: k8s-ci-robot

pkg/controller/controller.go

@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/kubernetes-csi/csi-lib-utils/slowset"
 	"github.com/kubernetes-csi/external-resizer/pkg/features"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 
@@ -72,7 +73,7 @@ type resizeController struct {
 
 	// slowSet is used to track PVCs for which expansion failed with infeasible error
 	// and should be retried at slower rate.
-	slowSet *util.SlowSet
+	slowSet *slowset.SlowSet
 
 	// a cache to store PersistentVolume objects
 	volumes cache.Store
@@ -114,7 +115,7 @@ func NewResizeController(
 		volumes:                pvInformer.Informer().GetStore(),
 		claims:                 pvcInformer.Informer().GetStore(),
 		eventRecorder:          eventRecorder,
-		slowSet:                util.NewSlowSet(maxRetryInterval),
+		slowSet:                slowset.NewSlowSet(maxRetryInterval),
 		finalErrorPVCs:         sets.New[string](),
 		usedPVCs:               newUsedPVCStore(),
 		handleVolumeInUseError: handleVolumeInUseError,

pkg/controller/expand_and_recover.go

@@ -19,7 +19,9 @@ package controller
 import (
 	"errors"
 	"fmt"
+	"time"
 
+	"github.com/kubernetes-csi/csi-lib-utils/slowset"
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -199,7 +201,9 @@ func (ctrl *resizeController) expandAndRecover(pvc *v1.PersistentVolumeClaim, pv
 
 func (ctrl *resizeController) markForSlowRetry(pvcKey string, resizeStatus v1.ClaimResourceStatus) {
 	if resizeStatus == v1.PersistentVolumeClaimControllerResizeInfeasible {
-		ctrl.slowSet.Add(pvcKey)
+		ctrl.slowSet.Add(pvcKey, slowset.ObjectData{
+			Timestamp: time.Now(),
+		})
 	}
 }
 

pkg/modifycontroller/controller.go

@@ -23,6 +23,7 @@ import (
 
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
 
+	"github.com/kubernetes-csi/csi-lib-utils/slowset"
 	"github.com/kubernetes-csi/external-resizer/pkg/modifier"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -62,7 +63,7 @@ type modifyController struct {
 	// the key of the map is {PVC_NAMESPACE}/{PVC_NAME}
 	uncertainPVCs map[string]v1.PersistentVolumeClaim
 	// slowSet tracks PVCs for which modification failed with infeasible error and should be retried at slower rate.
-	slowSet *util.SlowSet
+	slowSet *slowset.SlowSet
 }
 
 // NewModifyController returns a ModifyController.
@@ -102,7 +103,7 @@ func NewModifyController(
 		claimQueue:          claimQueue,
 		eventRecorder:       eventRecorder,
 		extraModifyMetadata: extraModifyMetadata,
-		slowSet:             util.NewSlowSet(maxRetryInterval),
+		slowSet:             slowset.NewSlowSet(maxRetryInterval),
 	}
 	// Add a resync period as the PVC's request modify can be modified again when we are handling
 	// a previous modify request of the same PVC.

pkg/modifycontroller/modify_volume.go

@@ -18,7 +18,9 @@ package modifycontroller
 
 import (
 	"fmt"
+	"time"
 
+	"github.com/kubernetes-csi/csi-lib-utils/slowset"
 	"github.com/kubernetes-csi/external-resizer/pkg/util"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
@@ -204,6 +206,8 @@ func (ctrl *modifyController) delayModificationIfRecentlyInfeasible(pvc *v1.Pers
 func (ctrl *modifyController) markForSlowRetry(pvc *v1.PersistentVolumeClaim, pvcKey string) {
 	s := pvc.Status.ModifyVolumeStatus
 	if s != nil && s.Status == v1.PersistentVolumeClaimModifyVolumeInfeasible {
-		ctrl.slowSet.Add(pvcKey)
+		ctrl.slowSet.Add(pvcKey, slowset.ObjectData{
+			Timestamp: time.Now(),
+		})
 	}
 }

pkg/util/slowset_test.go

@@ -79,6 +79,7 @@ github.com/kubernetes-csi/csi-lib-utils/leaderelection
 github.com/kubernetes-csi/csi-lib-utils/metrics
 github.com/kubernetes-csi/csi-lib-utils/protosanitizer
 github.com/kubernetes-csi/csi-lib-utils/rpc
+github.com/kubernetes-csi/csi-lib-utils/slowset
 github.com/kubernetes-csi/csi-lib-utils/standardflags
 # github.com/mailru/easyjson v0.9.0
 ## explicit; go 1.20