Merge pull request #1554 from mowangdk/cleanup/disable_auto_fallabck_for_bmcpfs

Disable additional cgroup of efc container

Author: k8s-ci-robot

build/csi-agent/Dockerfile

@@ -18,7 +18,7 @@ ARG TARGETPLATFORM
 # The versions specified here are for RPM packages, which may not necessarily align with the image version
 ARG OSSFS_VERSION=v1.91.8.ack.3
 ARG OSSFS2_VERSION=v2.0.4.ack.1
-ARG ALINAS_UTILS_VERSION=1.9-0.20250805171424.2871b7.al7
+ARG ALINAS_UTILS_VERSION=1.9-0.20251120211108.7e6a18.al7
 ARG EFC_VERSION=1.9-20250822095129.f34347.release
 # v2.1 is exclusive to a specific storage cluster version and the first to support ARM arch. 
 # It's temporarily unavailable for all ACK clusters, 

build/mount-proxy/Dockerfile

@@ -96,7 +96,7 @@ ENTRYPOINT ["csi-mount-proxy-server", "--driver=ossfs2"]
 FROM registry-cn-hangzhou.ack.aliyuncs.com/dev/alinux:3-update as alinas
 
 ARG TARGETPLATFORM
-ARG ALINAS_UTILS_VERSION=1.9-0.20250805171424.2871b7.al7
+ARG ALINAS_UTILS_VERSION=1.9-0.20251120211108.7e6a18.al7
 ARG EFC_VERSION=1.9-20250822095129.f34347.release
 # v2.1 is exclusive to a specific storage cluster version and the first to support ARM arch. 
 # It's temporarily unavailable for all ACK clusters, 

pkg/mounter/proxy/server/alinas/driver.go

@@ -92,8 +92,11 @@ func addAutoFallbackNFSMountOptions(mountOptions []string) []string {
 			}
 		}
 	}
-	if isEFC && !isVSC {
-		mountOptions = append(mountOptions, "auto_fallback_nfs")
+	if isEFC {
+		mountOptions = append(mountOptions, "no_add_cgroup")
+		if !isVSC {
+			mountOptions = append(mountOptions, "auto_fallback_nfs")
+		}
 	}
 	return mountOptions
 }

pkg/mounter/proxy/server/alinas/driver_test.go

@@ -0,0 +1,73 @@
+package alinas
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestAddAutoFallbackNFSMountOptions(t *testing.T) {
+	tests := []struct {
+		name         string
+		inputOptions []string
+		expected     []string
+	}{
+		{
+			name:         "Empty options",
+			inputOptions: []string{},
+			expected:     []string{},
+		},
+		{
+			name:         "EFC without VSC should add both no_add_cgroup and auto_fallback_nfs",
+			inputOptions: []string{"efc"},
+			expected:     []string{"efc", "no_add_cgroup", "auto_fallback_nfs"},
+		},
+		{
+			name:         "EFC with VSC should only add no_add_cgroup",
+			inputOptions: []string{"efc", "net=vsc"},
+			expected:     []string{"efc", "net=vsc", "no_add_cgroup"},
+		},
+		{
+			name:         "EFC with non-VSC net option should add both options",
+			inputOptions: []string{"efc", "net=other"},
+			expected:     []string{"efc", "net=other", "no_add_cgroup", "auto_fallback_nfs"},
+		},
+		{
+			name:         "Multiple options with EFC but no VSC",
+			inputOptions: []string{"rw", "efc", "hard"},
+			expected:     []string{"rw", "efc", "hard", "no_add_cgroup", "auto_fallback_nfs"},
+		},
+		{
+			name:         "Multiple options with EFC and VSC",
+			inputOptions: []string{"rw", "efc", "net=vsc", "hard"},
+			expected:     []string{"rw", "efc", "net=vsc", "hard", "no_add_cgroup"},
+		},
+		{
+			name:         "No EFC should not add any options",
+			inputOptions: []string{"rw", "hard"},
+			expected:     []string{"rw", "hard"},
+		},
+		{
+			name:         "Comma-separated options with EFC but no VSC",
+			inputOptions: []string{"rw,efc,hard"},
+			expected:     []string{"rw,efc,hard", "no_add_cgroup", "auto_fallback_nfs"},
+		},
+		{
+			name:         "Comma-separated options with EFC and VSC",
+			inputOptions: []string{"rw,efc,net=vsc,hard"},
+			expected:     []string{"rw,efc,net=vsc,hard", "no_add_cgroup"},
+		},
+		{
+			name:         "Empty option string in slice",
+			inputOptions: []string{"", "efc"},
+			expected:     []string{"", "efc", "no_add_cgroup", "auto_fallback_nfs"},
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := addAutoFallbackNFSMountOptions(tt.inputOptions)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}