Merge pull request #304 from andyzhangx/mountoptions-doc

doc: add cost saving mount options

Author: andyzhangx

deploy/example/storageclass-blobfuse-existing-container.yaml

@@ -11,3 +11,10 @@ parameters:
   server: SERVER_ADDRESS  # optional, provide a new address to replace default "accountname.blob.core.windows.net"
 reclaimPolicy: Retain  # if set as "Delete" container would be removed after pvc deletion
 volumeBindingMode: Immediate
+mountOptions:
+  - -o allow_other
+  - --file-cache-timeout-in-seconds=120
+  - --use-attr-cache=true
+  - -o attr_timeout=120
+  - -o entry_timeout=120
+  - -o negative_timeout=120

deploy/example/storageclass-blobfuse-mountoptions.yaml

@@ -8,3 +8,10 @@ parameters:
   skuName: Standard_LRS  # available values: Standard_LRS, Premium_LRS, Standard_GRS, Standard_RAGRS
 reclaimPolicy: Retain  # if set as "Delete" container would be removed after pvc deletion
 volumeBindingMode: Immediate
+mountOptions:
+  - -o allow_other
+  - --file-cache-timeout-in-seconds=120
+  - --use-attr-cache=true
+  - -o attr_timeout=120
+  - -o entry_timeout=120
+  - -o negative_timeout=120

deploy/example/storageclass-blobfuse.yaml

@@ -3,8 +3,6 @@
 
 ### Dynamic Provisioning
   > [blobfuse example](../deploy/example/storageclass-blobfuse.yaml)
- 
-  > [blobfuse mountOptions example](../deploy/example/storageclass-blobfuse-mountoptions.yaml)
 
   > [nfs example](../deploy/example/storageclass-blob-nfs.yaml)
 

docs/driver-parameters.md

@@ -45,12 +45,6 @@ const (
 	separator                  = "#"
 	volumeIDTemplate           = "%s#%s#%s"
 	secretNameTemplate         = "azure-storage-account-%s-secret"
-	fileMode                   = "file_mode"
-	dirMode                    = "dir_mode"
-	vers                       = "vers"
-	defaultFileMode            = "0777"
-	defaultDirMode             = "0777"
-	defaultVers                = "3.0"
 	serverNameField            = "server"
 	tagsField                  = "tags"
 	protocolField              = "protocol"
@@ -178,45 +172,6 @@ func GetContainerInfo(id string) (string, string, string, error) {
 	return segments[0], segments[1], segments[2], nil
 }
 
-// check whether mountOptions contains file_mode, dir_mode, vers, if not, append default mode
-func appendDefaultMountOptions(mountOptions []string) []string {
-	fileModeFlag := false
-	dirModeFlag := false
-	versFlag := false
-
-	for _, mountOption := range mountOptions {
-		if strings.HasPrefix(mountOption, fileMode) {
-			fileModeFlag = true
-		}
-		if strings.HasPrefix(mountOption, dirMode) {
-			dirModeFlag = true
-		}
-		if strings.HasPrefix(mountOption, vers) {
-			versFlag = true
-		}
-	}
-
-	allMountOptions := mountOptions
-	if !fileModeFlag {
-		allMountOptions = append(allMountOptions, fmt.Sprintf("%s=%s", fileMode, defaultFileMode))
-	}
-
-	if !dirModeFlag {
-		allMountOptions = append(allMountOptions, fmt.Sprintf("%s=%s", dirMode, defaultDirMode))
-	}
-
-	if !versFlag {
-		allMountOptions = append(allMountOptions, fmt.Sprintf("%s=%s", vers, defaultVers))
-	}
-
-	/* todo: looks like fsGroup is not included in CSI
-	if !gidFlag && fsGroup != nil {
-		allMountOptions = append(allMountOptions, fmt.Sprintf("%s=%d", gid, *fsGroup))
-	}
-	*/
-	return allMountOptions
-}
-
 // A container name must be a valid DNS name, conforming to the following naming rules:
 //	1. Container names must start with a letter or number, and can contain only letters, numbers, and the dash (-) character.
 //	2. Every dash (-) character must be immediately preceded and followed by a letter or number; consecutive dashes are not permitted in container names.

pkg/blob/blob.go

@@ -137,50 +137,6 @@ func TestRun(t *testing.T) {
 	}
 }
 
-func TestAppendDefaultMountOptions(t *testing.T) {
-	tests := []struct {
-		options  []string
-		expected []string
-	}{
-		{
-			options: []string{"dir_mode=0777"},
-			expected: []string{"dir_mode=0777",
-				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers)},
-		},
-		{
-			options: []string{"file_mode=0777"},
-			expected: []string{"file_mode=0777",
-				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers)},
-		},
-		{
-			options: []string{"vers=2.1"},
-			expected: []string{"vers=2.1",
-				fmt.Sprintf("%s=%s", fileMode, defaultFileMode),
-				fmt.Sprintf("%s=%s", dirMode, defaultDirMode)},
-		},
-		{
-			options: []string{""},
-			expected: []string{"", fmt.Sprintf("%s=%s",
-				fileMode, defaultFileMode),
-				fmt.Sprintf("%s=%s", dirMode, defaultDirMode),
-				fmt.Sprintf("%s=%s", vers, defaultVers)},
-		},
-		{
-			options:  []string{"file_mode=0777", "dir_mode=0777"},
-			expected: []string{"file_mode=0777", "dir_mode=0777", fmt.Sprintf("%s=%s", vers, defaultVers)},
-		},
-	}
-
-	for _, test := range tests {
-		result := appendDefaultMountOptions(test.options)
-		if !reflect.DeepEqual(result, test.expected) {
-			t.Errorf("input: %q, appendDefaultMountOptions result: %q, expected: %q", test.options, result, test.expected)
-		}
-	}
-}
-
 func TestGetContainerInfo(t *testing.T) {
 	tests := []struct {
 		options   string