support mountOptions in configmap (#1103)

support mountOptions in configmap
juicedata · Sep 3, 2024 · 1b9d295 · 1b9d295
1 parent 620ef9f
commit 1b9d295
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 5 deletions.
diff --git a/.github/scripts/util.py b/.github/scripts/util.py
@@ -160,6 +160,7 @@ def wait_dir_not_empty(check_path):
         output = subprocess.run(["sudo", "ls", check_path], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         if output.stderr.decode("utf-8") != "":
             LOG.info("output stderr {}".format(output.stderr.decode("utf-8")))
+            time.sleep(5)
             continue
         if output.stdout.decode("utf-8") != "":
             return True

diff --git a/juicefs-csi-driver-config.example.yaml b/juicefs-csi-driver-config.example.yaml
@@ -86,4 +86,12 @@ data:
       #   volumes:
       #     - name: block-devices
       #       persistentVolumeClaim:
-      #         claimName: block-pv
+      #         claimName: block-pv
+
+      # add some mountOptions to the mount pod
+      # - pvcSelector:
+      #     matchLabels:
+      #       need-mount-options: "true"
+      #   mountOptions:
+      #     - writeback
+      #     - xxx
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -214,6 +214,7 @@ type MountPodPatch struct {
 	VolumeDevices                 []corev1.VolumeDevice        `json:"volumeDevices,omitempty"`
 	VolumeMounts                  []corev1.VolumeMount         `json:"volumeMounts,omitempty"`
 	Env                           []corev1.EnvVar              `json:"env,omitempty"`
+	MountOptions                  []string                     `json:"mountOptions,omitempty"`
 }
 
 func (mpp *MountPodPatch) isMatch(pvc *corev1.PersistentVolumeClaim) bool {
@@ -332,6 +333,9 @@ func (mpp *MountPodPatch) merge(mp MountPodPatch) {
 	if mp.Env != nil {
 		mpp.Env = mp.Env
 	}
+	if mp.MountOptions != nil {
+		mpp.MountOptions = mp.MountOptions
+	}
 }
 
 // TODO: migrate more config for here

diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -413,6 +413,21 @@ func TestGenMountPodPatch(t *testing.T) {
 				},
 			},
 		},
+		{
+			name: "test mount options",
+			baseConfig: &Config{
+				MountPodPatch: []MountPodPatch{
+					{
+						MountOptions: []string{"rw", "nolock"},
+					},
+				},
+			},
+			expectedPatch: MountPodPatch{
+				Labels:       map[string]string{},
+				Annotations:  map[string]string{},
+				MountOptions: []string{"rw", "nolock"},
+			},
+		},
 	}
 
 	for _, tc := range testCases {

diff --git a/pkg/config/setting.go b/pkg/config/setting.go
@@ -459,9 +459,10 @@ func GenPodAttrWithCfg(setting *JfsSetting, volCtx map[string]string) error {
 			}
 		}
 	}
-
+	setting.Attr = attr
 	// apply config patch
-	applyAttrPatch(attr, setting)
+	applyConfigPatch(setting)
+
 	return nil
 }
 
@@ -527,12 +528,14 @@ func GenPodAttrWithMountPod(ctx context.Context, client *k8sclient.K8sClient, mo
 		Name:      mountPod.Annotations[JuiceFSUUID],
 		VolumeId:  mountPod.Annotations[UniqueId],
 		MountPath: filepath.Join(PodMountBase, pvName) + mountPod.Name[len(mountPod.Name)-7:],
+		Options:   pv.Spec.MountOptions,
 	}
 	if v, ok := pv.Spec.CSI.VolumeAttributes["subPath"]; ok && v != "" {
 		setting.SubPath = v
 	}
+	setting.Attr = attr
 	// apply config patch
-	applyAttrPatch(attr, setting)
+	applyConfigPatch(setting)
 	return attr, nil
 }
 
@@ -698,7 +701,8 @@ func getDefaultResource() corev1.ResourceRequirements {
 	}
 }
 
-func applyAttrPatch(attr *PodAttr, setting *JfsSetting) {
+func applyConfigPatch(setting *JfsSetting) {
+	attr := setting.Attr
 	// overwrite by mountpod patch
 	patch := GlobalConfig.GenMountPodPatch(*setting)
 	if patch.Image != "" {
@@ -728,6 +732,19 @@ func applyAttrPatch(attr *PodAttr, setting *JfsSetting) {
 	attr.VolumeMounts = patch.VolumeMounts
 	attr.Volumes = patch.Volumes
 	attr.Env = patch.Env
+
+	// merge or overwrite setting options
+	if setting.Options == nil {
+		setting.Options = make([]string, 0)
+	}
+	for _, option := range patch.MountOptions {
+		for i, o := range setting.Options {
+			if strings.Split(o, "=")[0] == option {
+				setting.Options = append(setting.Options[:i], setting.Options[i+1:]...)
+			}
+		}
+		setting.Options = append(setting.Options, option)
+	}
 }
 
 // IsCEMountPod check if the pod is a mount pod of CE