Merge pull request #1423 from AlbeeSo/feat/add-ossfs1-def-options

ossfs 1.0: add default option: listobjectsv2

Author: k8s-ci-robot

pkg/mounter/oss/ossfs.go

@@ -298,20 +298,29 @@ func (f *fuseOssfs) getAuthOptions(o *Options, region string) (mountOptions []st
 	return
 }
 
+const (
+	KeyDbgLevel      = "dbglevel"
+	KeyMime          = "mime"
+	KeyListObjectsV2 = "listobjectsv2"
+)
+
 func (f *fuseOssfs) AddDefaultMountOptions(options []string) []string {
 	defaultOSSFSOptions := os.Getenv("DEFAULT_OSSFS_OPTIONS")
 	if defaultOSSFSOptions != "" {
 		options = append(options, strings.Split(defaultOSSFSOptions, ",")...)
 	}
 
-	alreadySet := false
+	tm := map[string]string{}
 	for _, option := range options {
-		if strings.Contains(option, "dbglevel") {
-			alreadySet = true
-			break
+		if option == "" {
+			continue
 		}
+		k, v, _ := strings.Cut(option, "=")
+		tm[k] = v
 	}
-	if !alreadySet {
+
+	// set default dbg level
+	if _, ok := tm[KeyDbgLevel]; !ok {
 		level, ok := ossfsDbglevels[f.config.Dbglevel]
 		if ok {
 			options = append(options, fmt.Sprintf("dbglevel=%s", level))
@@ -323,9 +332,21 @@ func (f *fuseOssfs) AddDefaultMountOptions(options []string) []string {
 		}
 	}
 
-	if !csiutils.IsFileExisting(filepath.Join(hostPrefix, OssfsDefMimeTypesFilePath)) && strings.ToLower(f.config.Extra["mime-support"]) == "true" {
-		// mime.types not exists, use csi-mime.types
-		options = append(options, fmt.Sprintf("mime=%s", OssfsCsiMimeTypesFilePath))
+	// set mime
+	if _, ok := tm[KeyMime]; !ok {
+		if !csiutils.IsFileExisting(filepath.Join(hostPrefix, OssfsDefMimeTypesFilePath)) && strings.ToLower(f.config.Extra["mime-support"]) == "true" {
+			// mime.types not exists, use csi-mime.types
+			options = append(options, fmt.Sprintf("mime=%s", OssfsCsiMimeTypesFilePath))
+		}
+	}
+
+	// set listobjectsv2
+	// Note: OSS officially recommends using v2 API as the preferred version,
+	// but ossfs hasn't enabled listobjectv2 by default yet.
+	// This is a temporary workaround added by CSI driver.
+	// TODO: Remove this logic when ossfs enables it by default.
+	if _, ok := tm[KeyListObjectsV2]; !ok {
+		options = append(options, "listobjectsv2")
 	}
 
 	return options

pkg/mounter/oss/ossfs_test.go

@@ -561,36 +561,41 @@ func TestAddDefaultMountOptions_ossfs(t *testing.T) {
 		{
 			name:    "empty option, empty config",
 			options: []string{"others"},
-			want:    []string{"others", "dbglevel=err"},
+			want:    []string{"others", "dbglevel=err", "listobjectsv2"},
 		},
 		{
 			name:    "set option",
 			options: []string{"others", "dbglevel=debug", "others"},
-			want:    []string{"others", "dbglevel=debug", "others"},
+			want:    []string{"others", "dbglevel=debug", "others", "listobjectsv2"},
 		},
 		{
 			name:     "set option, set config",
 			cfglevel: "info",
 			options:  []string{"others", "dbglevel=debug", "others"},
-			want:     []string{"others", "dbglevel=debug", "others"},
+			want:     []string{"others", "dbglevel=debug", "others", "listobjectsv2"},
 		},
 		{
 			name:     "empty option, set config",
 			cfglevel: "debug",
 			options:  []string{"others"},
-			want:     []string{"others", "dbglevel=debug"},
+			want:     []string{"others", "dbglevel=debug", "listobjectsv2"},
 		},
 		{
 			name:     "empty option, invalid config",
 			cfglevel: "invalid",
 			options:  []string{"others"},
-			want:     []string{"others", "dbglevel=err"},
+			want:     []string{"others", "dbglevel=err", "listobjectsv2"},
 		},
 		{
 			name:        "mime-support=true",
 			enabledMime: true,
 			options:     []string{"others"},
-			want:        []string{"others", "dbglevel=err", "mime=" + OssfsCsiMimeTypesFilePath},
+			want:        []string{"others", "dbglevel=err", "mime=" + OssfsCsiMimeTypesFilePath, "listobjectsv2"},
+		},
+		{
+			name:    "listobjectsv2 has set",
+			options: []string{"others", "listobjectsv2"},
+			want:    []string{"others", "listobjectsv2", "dbglevel=err"},
 		},
 	}
 	for _, tt := range tests {