Removing Slow Set Utility out of repository

Author: mdzraf

go.mod

@@ -88,3 +88,5 @@ replace k8s.io/component-base => k8s.io/component-base v0.32.0
 replace k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
 
 replace k8s.io/kms => k8s.io/kms v0.32.0
+
+replace github.com/kubernetes-csi/csi-lib-utils => ../csi-lib-utils

go.sum

@@ -60,8 +60,6 @@ github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
 github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/kubernetes-csi/csi-lib-utils v0.21.0 h1:dUN/iIgXLucAxyML2iPyhniIlACQumIeAJmIzsMBddc=
-github.com/kubernetes-csi/csi-lib-utils v0.21.0/go.mod h1:ZCVRTYuup+bwX9tOeE5Q3LDw64QvltSwMUQ3M3g2T+Q=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=

pkg/controller/controller.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"time"
 
+	"github.com/kubernetes-csi/csi-lib-utils/slowset"
 	"github.com/kubernetes-csi/external-resizer/pkg/features"
 	"k8s.io/apimachinery/pkg/api/errors"
 
@@ -71,7 +72,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
@@ -113,7 +114,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

@@ -18,7 +18,9 @@ package controller
 
 import (
 	"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"
@@ -198,7 +200,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"
@@ -197,6 +199,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

@@ -87,14 +87,15 @@ github.com/klauspost/compress/internal/cpuinfo
 github.com/klauspost/compress/internal/snapref
 github.com/klauspost/compress/zstd
 github.com/klauspost/compress/zstd/internal/xxhash
-# github.com/kubernetes-csi/csi-lib-utils v0.21.0
+# github.com/kubernetes-csi/csi-lib-utils v0.21.0 => ../csi-lib-utils
 ## explicit; go 1.23.1
 github.com/kubernetes-csi/csi-lib-utils/accessmodes
 github.com/kubernetes-csi/csi-lib-utils/connection
 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/mailru/easyjson v0.9.0
 ## explicit; go 1.20
 github.com/mailru/easyjson/buffer
@@ -849,3 +850,4 @@ sigs.k8s.io/yaml/goyaml.v2
 # k8s.io/component-base => k8s.io/component-base v0.32.0
 # k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.2
 # k8s.io/kms => k8s.io/kms v0.32.0
+# github.com/kubernetes-csi/csi-lib-utils => ../csi-lib-utils