Merge pull request #578 from andyzhangx/reuse-original-mount-v1.4

fix: avoid using different mount path in remount on v1.4

Author: andyzhangx

pkg/blob/blob.go

@@ -613,7 +613,9 @@ func appendDefaultMountOptions(mountOptions []string, tmpPath, containerName str
 		"--tmp-path":           tmpPath,
 		"--container-name":     containerName,
 		// prevent billing charges on mounting
-		"--cancel-list-on-mount-seconds": "60",
+		"--cancel-list-on-mount-seconds": "10",
+		// allow remounting using a non-empty tmp-path
+		"--empty-dir-check": "false",
 	}
 
 	// stores the mount options already included in mountOptions

pkg/blob/blob_test.go

@@ -786,9 +786,10 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			options:       []string{"targetPath"},
 			tmpPath:       "/tmp",
 			containerName: "containerName",
-			expected: []string{"--cancel-list-on-mount-seconds=60",
+			expected: []string{"--cancel-list-on-mount-seconds=10",
 				"--container-name=containerName",
 				"--pre-mount-validate=true",
+				"--empty-dir-check=false",
 				"--tmp-path=/tmp",
 				"--use-https=true",
 				"targetPath",
@@ -801,6 +802,7 @@ func TestAppendDefaultMountOptions(t *testing.T) {
 			expected: []string{"--cancel-list-on-mount-seconds=0",
 				"--container-name=containerName",
 				"--pre-mount-validate=false",
+				"--empty-dir-check=false",
 				"--tmp-path=/tmp",
 				"--use-https=true",
 				"targetPath",

pkg/blob/nodeserver.go

@@ -271,8 +271,7 @@ func (d *Driver) NodeStageVolume(ctx context.Context, req *csi.NodeStageVolumeRe
 	if ephemeralVol {
 		mountOptions = util.JoinMountOptions(mountOptions, strings.Split(ephemeralVolMountOptions, ","))
 	}
-	// set different tmp-path with time info
-	tmpPath := fmt.Sprintf("%s/%s#%d", "/mnt", volumeID, time.Now().Unix())
+	tmpPath := fmt.Sprintf("%s/%s", "/mnt", volumeID)
 	mountOptions = appendDefaultMountOptions(mountOptions, tmpPath, containerName)
 
 	args := targetPath