fix: delay removing skipMatchingTag when account is full

Author: andyzhangx

pkg/azurefile/azurefile.go

@@ -198,6 +198,7 @@ type DriverOptions struct {
 	KubeAPIQPS                             float64
 	KubeAPIBurst                           int
 	AppendNoShareSockOption                bool
+	SkipMatchingTagCacheExpireInMinutes    int
 }
 
 // Driver implements all interfaces of CSI drivers
@@ -238,8 +239,8 @@ type Driver struct {
 	dataPlaneAPIAccountCache *azcache.TimedCache
 	// a timed cache storing account search history (solve account list throttling issue)
 	accountSearchCache *azcache.TimedCache
-	// a timed cache storing tag removing history (solve account update throttling issue)
-	removeTagCache *azcache.TimedCache
+	// a timed cache storing whether skipMatchingTag is added or removed recently
+	skipMatchingTagCache *azcache.TimedCache
 	// a timed cache when resize file share failed due to account limit exceeded
 	resizeFileShareFailureCache *azcache.TimedCache
 }
@@ -279,7 +280,10 @@ func NewDriver(options *DriverOptions) *Driver {
 		klog.Fatalf("%v", err)
 	}
 
-	if driver.removeTagCache, err = azcache.NewTimedcache(3*time.Minute, getter); err != nil {
+	if options.SkipMatchingTagCacheExpireInMinutes <= 0 {
+		options.SkipMatchingTagCacheExpireInMinutes = 30 // default expire in 30 minutes
+	}
+	if driver.skipMatchingTagCache, err = azcache.NewTimedcache(time.Duration(options.SkipMatchingTagCacheExpireInMinutes)*time.Minute, getter); err != nil {
 		klog.Fatalf("%v", err)
 	}
 
@@ -866,17 +870,17 @@ func (d *Driver) GetTotalAccountQuota(ctx context.Context, subsID, resourceGroup
 // RemoveStorageAccountTag remove tag from storage account
 func (d *Driver) RemoveStorageAccountTag(ctx context.Context, subsID, resourceGroup, account, key string) error {
 	// search in cache first
-	cache, err := d.removeTagCache.Get(account, azcache.CacheReadTypeDefault)
+	cache, err := d.skipMatchingTagCache.Get(account, azcache.CacheReadTypeDefault)
 	if err != nil {
 		return err
 	}
 	if cache != nil {
-		klog.V(6).Infof("skip remove tag(%s) on account(%s) subsID(%s) resourceGroup(%s) since tag already removed in a short time", key, account, subsID, resourceGroup)
+		klog.V(6).Infof("skip remove tag(%s) on account(%s) subsID(%s) resourceGroup(%s) since tag is added or removed in a short time", key, account, subsID, resourceGroup)
 		return nil
 	}
 
 	klog.V(2).Infof("remove tag(%s) on account(%s) subsID(%s), resourceGroup(%s)", key, account, subsID, resourceGroup)
-	defer d.removeTagCache.Set(account, key)
+	defer d.skipMatchingTagCache.Set(account, "")
 	if rerr := d.cloud.RemoveStorageAccountTag(ctx, subsID, resourceGroup, account, key); rerr != nil {
 		return rerr.Error()
 	}

pkg/azurefile/controllerserver.go

@@ -486,6 +486,8 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 			if rerr := d.cloud.AddStorageAccountTags(ctx, subsID, resourceGroup, accountName, skipMatchingTag); rerr != nil {
 				klog.Warningf("AddStorageAccountTags(%v) on account(%s) subsID(%s) rg(%s) failed with error: %v", tags, accountName, subsID, resourceGroup, rerr.Error())
 			}
+			// do not remove skipMatchingTag in a period of time
+			d.skipMatchingTagCache.Set(accountName, "")
 			// release volume lock first to prevent deadlock
 			d.volumeLocks.Release(volName)
 			// clean search cache

pkg/azurefileplugin/main.go

@@ -55,6 +55,7 @@ var (
 	kubeAPIQPS                             = flag.Float64("kube-api-qps", 25.0, "QPS to use while communicating with the kubernetes apiserver.")
 	kubeAPIBurst                           = flag.Int("kube-api-burst", 50, "Burst to use while communicating with the kubernetes apiserver.")
 	appendNoShareSockOption                = flag.Bool("append-nosharesock-option", true, "Whether appending nosharesock option to smb mount command")
+	skipMatchingTagCacheExpireInMinutes    = flag.Int("skip-matching-tag-cache-expire-in-minutes", 30, "The cache expire time in minutes for skipMatchingTagCache")
 )
 
 func main() {
@@ -95,6 +96,7 @@ func handle() {
 		KubeAPIQPS:                             *kubeAPIQPS,
 		KubeAPIBurst:                           *kubeAPIBurst,
 		AppendNoShareSockOption:                *appendNoShareSockOption,
+		SkipMatchingTagCacheExpireInMinutes:    *skipMatchingTagCacheExpireInMinutes,
 	}
 	driver := azurefile.NewDriver(&driverOptions)
 	if driver == nil {