Merge pull request #585 from andyzhangx/append-timestamp

feat: add append-timestamp-cache-dir support in chart

Author: andyzhangx

charts/latest/blob-csi-driver-v1.8.0.tgz

@@ -123,6 +123,7 @@ spec:
             - "--user-agent-suffix={{ .Values.driver.userAgentSuffix }}"
             - "--allow-empty-cloud-config={{ .Values.node.allowEmptyCloudConfig }}"
             - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}"
+            - "--append-timestamp-cache-dir={{ .Values.node.appendTimeStampInCacheDir }}"
           ports:
             - containerPort: {{ .Values.node.livenessProbe.healthPort }}
               name: healthz

charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

@@ -122,6 +122,7 @@ node:
     maxOpenFileNum: "9000000"
     disableUpdateDB: true
   blobfuseCachePath: /mnt
+  appendTimeStampInCacheDir: false
   resources:
     livenessProbe:
       limits:

charts/latest/blob-csi-driver/values.yaml

@@ -120,6 +120,7 @@ type DriverOptions struct {
 	EnableBlobMockMount        bool
 	AllowEmptyCloudConfig      bool
 	EnableGetVolumeStats       bool
+	AppendTimeStampInCacheDir  bool
 }
 
 // Driver implements all interfaces of CSI drivers
@@ -132,13 +133,14 @@ type Driver struct {
 	userAgentSuffix            string
 	blobfuseProxyEndpoint      string
 	// enableBlobMockMount is only for testing, DO NOT set as true in non-testing scenario
-	enableBlobMockMount     bool
-	enableBlobfuseProxy     bool
-	allowEmptyCloudConfig   bool
-	enableGetVolumeStats    bool
-	blobfuseProxyConnTimout int
-	mounter                 *mount.SafeFormatAndMount
-	volLockMap              *util.LockMap
+	enableBlobMockMount       bool
+	enableBlobfuseProxy       bool
+	allowEmptyCloudConfig     bool
+	enableGetVolumeStats      bool
+	appendTimeStampInCacheDir bool
+	blobfuseProxyConnTimout   int
+	mounter                   *mount.SafeFormatAndMount
+	volLockMap                *util.LockMap
 	// A map storing all volumes with ongoing operations so that additional operations
 	// for that same volume (as defined by VolumeID) return an Aborted error
 	volumeLocks *volumeLocks

pkg/blob/blob.go

@@ -278,6 +278,9 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 		mountOptions = util.JoinMountOptions(mountOptions, []string{"--use-adls=true"})
 	}
 	tmpPath := fmt.Sprintf("%s/%s", "/mnt", volumeID)
+	if d.appendTimeStampInCacheDir {
+		tmpPath += fmt.Sprintf("#%d", time.Now().Unix())
+	}
 	mountOptions = appendDefaultMountOptions(mountOptions, tmpPath, containerName)
 
 	args := targetPath

pkg/blob/nodeserver.go

@@ -52,6 +52,7 @@ var (
 	userAgentSuffix            = flag.String("user-agent-suffix", "", "userAgent suffix")
 	allowEmptyCloudConfig      = flag.Bool("allow-empty-cloud-config", true, "allow running driver without cloud config")
 	enableGetVolumeStats       = flag.Bool("enable-get-volume-stats", false, "allow GET_VOLUME_STATS on agent node")
+	appendTimeStampInCacheDir  = flag.Bool("append-timestamp-cache-dir", false, "append timestamp into cache directory on agent node")
 )
 
 func main() {
@@ -85,6 +86,7 @@ func handle() {
 		UserAgentSuffix:            *userAgentSuffix,
 		AllowEmptyCloudConfig:      *allowEmptyCloudConfig,
 		EnableGetVolumeStats:       *enableGetVolumeStats,
+		AppendTimeStampInCacheDir:  *appendTimeStampInCacheDir,
 	}
 	driver := blob.NewDriver(&driverOptions)
 	if driver == nil {