Merge pull request #1394 from AlbeeSo/feat/save-logdir

ossfs2: set default logdir to /dev/stdout

Author: k8s-ci-robot

pkg/mounter/oss/ossfs.go

@@ -299,6 +299,11 @@ func (f *fuseOssfs) getAuthOptions(o *Options, region string) (mountOptions []st
 }
 
 func (f *fuseOssfs) AddDefaultMountOptions(options []string) []string {
+	defaultOSSFSOptions := os.Getenv("DEFAULT_OSSFS_OPTIONS")
+	if defaultOSSFSOptions != "" {
+		options = append(options, strings.Split(defaultOSSFSOptions, ",")...)
+	}
+
 	alreadySet := false
 	for _, option := range options {
 		if strings.Contains(option, "dbglevel") {
@@ -323,10 +328,6 @@ func (f *fuseOssfs) AddDefaultMountOptions(options []string) []string {
 		options = append(options, fmt.Sprintf("mime=%s", OssfsCsiMimeTypesFilePath))
 	}
 
-	defaultOSSFSOptions := os.Getenv("DEFAULT_OSSFS_OPTIONS")
-	if defaultOSSFSOptions != "" {
-		options = append(options, strings.Split(defaultOSSFSOptions, ",")...)
-	}
 	return options
 }
 

pkg/mounter/oss/ossfs2.go

@@ -186,15 +186,28 @@ func (f *fuseOssfs2) buildPodSpec(c *utils.FusePodContext, target string) (spec
 	return
 }
 
+const (
+	KeyLogLevel = "log_level"
+	KeyLogDir   = "log_dir"
+)
+
 func (f *fuseOssfs2) AddDefaultMountOptions(options []string) []string {
-	alreadySet := false
+	defaultOSSFSOptions := os.Getenv("DEFAULT_OSSFS2_OPTIONS")
+	if defaultOSSFSOptions != "" {
+		options = append(options, strings.Split(defaultOSSFSOptions, ",")...)
+	}
+
+	tm := map[string]string{}
 	for _, option := range options {
-		if strings.Contains(option, "log_level") {
-			alreadySet = true
-			break
+		if option == "" {
+			continue
 		}
+		k, v, _ := strings.Cut(option, "=")
+		tm[k] = v
 	}
-	if !alreadySet {
+
+	// set default log level
+	if _, ok := tm[KeyLogLevel]; !ok {
 		level, ok := ossfs2Dbglevels[f.config.Dbglevel]
 		if ok {
 			options = append(options, fmt.Sprintf("log_level=%s", level))
@@ -206,9 +219,9 @@ func (f *fuseOssfs2) AddDefaultMountOptions(options []string) []string {
 		}
 	}
 
-	defaultOSSFSOptions := os.Getenv("DEFAULT_OSSFS2_OPTIONS")
-	if defaultOSSFSOptions != "" {
-		options = append(options, strings.Split(defaultOSSFSOptions, ",")...)
+	// set default log dir
+	if _, ok := tm[KeyLogDir]; !ok {
+		options = append(options, "log_dir=/dev/stdout")
 	}
 
 	return options

pkg/mounter/oss/ossfs2_test.go

@@ -207,37 +207,37 @@ func TestAddDefaultMountOptions_ossfs2(t *testing.T) {
 		{
 			name:    "empty option, empty config",
 			options: []string{"others"},
-			want:    []string{"others", "log_level=info"},
+			want:    []string{"others", "log_level=info", "log_dir=/dev/stdout"},
 		},
 		{
 			name:    "set option",
-			options: []string{"others", "log_level=debug", "others"},
-			want:    []string{"others", "log_level=debug", "others"},
+			options: []string{"others", "log_level=debug", "log_dir=/tmp/ossfs2", "others"},
+			want:    []string{"others", "log_level=debug", "log_dir=/tmp/ossfs2", "others"},
 		},
 		{
 			name:     "set option, set config",
 			cfglevel: "info",
 			options:  []string{"others", "log_level=debug", "others"},
-			want:     []string{"others", "log_level=debug", "others"},
+			want:     []string{"others", "log_level=debug", "others", "log_dir=/dev/stdout"},
 		},
 		{
 			name:     "empty option, set config",
 			cfglevel: "debug",
 			options:  []string{"others"},
-			want:     []string{"others", "log_level=debug"},
+			want:     []string{"others", "log_level=debug", "log_dir=/dev/stdout"},
 		},
 		{
 			name:     "empty option, invalid config",
 			cfglevel: "invalid",
 			options:  []string{"others"},
-			want:     []string{"others", "log_level=info"},
+			want:     []string{"others", "log_level=info", "log_dir=/dev/stdout"},
 		},
 		{
 			name:        "default options",
 			cfglevel:    "",
 			options:     nil,
-			defaultOpts: "others",
-			want:        []string{"log_level=info", "others"},
+			defaultOpts: "others,log_dir=/tmp/ossfs2",
+			want:        []string{"others", "log_dir=/tmp/ossfs2", "log_level=info"},
 		},
 	}
 	for _, tt := range tests {

pkg/mounter/oss/ossfs_test.go

@@ -3,7 +3,6 @@ package oss
 import (
 	"context"
 	"fmt"
-	"reflect"
 	"testing"
 
 	"github.com/kubernetes-sigs/alibaba-cloud-csi-driver/pkg/cloud/metadata"
@@ -61,93 +60,6 @@ func Test_buildAuthSpec_ossfs(t *testing.T) {
 	assert.Contains(t, "rrsa-oidc-token", volumeMount.Name)
 }
 
-func Test_AddDefaultMountOptions(t *testing.T) {
-	tests := []struct {
-		name        string
-		options     []string
-		dbglevel    string
-		mime        string
-		defaultOpts string
-		want        []string
-	}{
-		{
-			name:     "Debug level not set",
-			options:  []string{},
-			dbglevel: "",
-			mime:     "false",
-			want:     []string{"dbglevel=err"},
-		},
-		{
-			name:     "Debug level set by config",
-			options:  []string{},
-			dbglevel: "warn",
-			mime:     "false",
-			want:     []string{"dbglevel=warn"},
-		},
-		{
-			name:     "Debug level set by mount options",
-			options:  []string{"dbglevel=info"},
-			dbglevel: "warn",
-			mime:     "false",
-			want:     []string{"dbglevel=info"},
-		},
-		{
-			name:     "Invalid debug level",
-			options:  []string{},
-			dbglevel: "unknown",
-			mime:     "false",
-			want:     []string{"dbglevel=err"},
-		},
-		{
-			name:     "Mime support enabled without existing mime.types",
-			options:  []string{},
-			dbglevel: "",
-			mime:     "true",
-			want:     []string{"dbglevel=err", "mime=" + OssfsCsiMimeTypesFilePath},
-		},
-		{
-			name:     "Mime support disabled with existing mime.types",
-			options:  []string{},
-			dbglevel: "",
-			mime:     "false",
-			want:     []string{"dbglevel=err"},
-		},
-		{
-			name:        "Default options",
-			options:     []string{},
-			dbglevel:    "",
-			mime:        "false",
-			defaultOpts: "allow_other,umask=000",
-			want:        []string{"dbglevel=err", "allow_other", "umask=000"},
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			f := &fuseOssfs{
-				config: mounterutils.FuseContainerConfig{
-					Dbglevel: tt.dbglevel,
-					Extra: map[string]string{
-						"mime-support": tt.mime,
-					},
-				},
-			}
-			if tt.defaultOpts != "" {
-				t.Setenv("DEFAULT_OSSFS_OPTIONS", tt.defaultOpts)
-			}
-			got := f.AddDefaultMountOptions(tt.options)
-			if len(got) != len(tt.want) {
-				t.Errorf("AddDefaultMountOptions() got = %v, want %v", got, tt.want)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("AddDefaultMountOptions() got = %v, want %v", got, tt.want)
-				return
-			}
-		})
-	}
-}
-
 func TestPrecheckAuthConfig_ossfs(t *testing.T) {
 	fakeMeta := metadata.NewMetadata()
 	fakeOssfs := NewFuseOssfs(nil, fakeMeta)