juicefs: support extra options in dataload

Signed-off-by: zwwhdls <zww@hdls.me>

Author: zwwhdls

charts/fluid-dataloader/juicefs/templates/configmap.yaml

@@ -38,7 +38,7 @@ data:
           local pod="${podNames[i]}"
 
           echo -e "juicefs warmup on $pod $targetPath starts"
-          /usr/local/bin/kubectl -n $ns exec -it $pod -- timeout $TIMEOUT /usr/local/bin/juicefs warmup $targetPath
+          /usr/local/bin/kubectl -n $ns exec -it $pod -- timeout $TIMEOUT /usr/local/bin/juicefs warmup $targetPath $OPTION
           echo -e "juicefs warmup on $pod $targetPath ends"
         done
         fi
@@ -47,7 +47,7 @@ data:
         then
           echo -e "juicefs warmup $targetPath starts"
           local pod="${podNames[0]}"
-          /usr/local/bin/kubectl -n $ns exec -it $pod -- timeout $TIMEOUT /usr/bin/juicefs warmup $targetPath
+          /usr/local/bin/kubectl -n $ns exec -it $pod -- timeout $TIMEOUT /usr/bin/juicefs warmup $targetPath $OPTION
           echo -e "juicefs warmup $targetPath ends"
         fi
     }

charts/fluid-dataloader/juicefs/templates/cronjob.yaml

@@ -111,6 +111,10 @@ spec:
                 - name: TIMEOUT
                   value: {{ $val | quote }}
                 {{- end }}
+                {{- if eq $key "option" }}
+                - name: OPTION
+                  value: {{ $val | quote }}
+                {{- end }}
                 {{- if eq $key "edition" }}
                 - name: EDITION
                   value: {{ $val | quote }}

charts/fluid-dataloader/juicefs/templates/job.yaml

@@ -124,6 +124,10 @@ spec:
             - name: TIMEOUT
               value: {{ $val | quote }}
             {{- end }}
+            {{- if eq $key "option" }}
+            - name: OPTION
+              value: {{ $val | quote }}
+            {{- end }}
             {{- if eq $key "edition" }}
             - name: EDITION
               value: {{ $val | quote }}

pkg/ddc/juicefs/data_load.go

@@ -179,12 +179,6 @@ func (j *JuiceFSEngine) genDataLoadValue(image string, cacheinfo map[string]stri
 	dataloadInfo.TargetPaths = targetPaths
 
 	options := map[string]string{}
-	// resolve spec options
-	if dataload.Spec.Options != nil {
-		for key, value := range dataload.Spec.Options {
-			options[key] = value
-		}
-	}
 
 	for key, value := range cacheinfo {
 		options[key] = value
@@ -201,9 +195,21 @@ func (j *JuiceFSEngine) genDataLoadValue(image string, cacheinfo map[string]stri
 	}
 	options["edition"] = cacheinfo[Edition]
 	options["runtimeName"] = j.name
-	if _, ok := options["timeout"]; !ok {
-		options["timeout"] = DefaultDataLoadTimeout
+	timeout := dataload.Spec.Options["timeout"]
+	delete(dataload.Spec.Options, "timeout")
+	if timeout == "" {
+		timeout = DefaultDataLoadTimeout
+	}
+	warmupOtions := []string{}
+	for k, v := range dataload.Spec.Options {
+		if v != "" {
+			warmupOtions = append(warmupOtions, fmt.Sprintf("--%s=%s", k, v))
+		} else {
+			warmupOtions = append(warmupOtions, fmt.Sprintf("--%s", k))
+		}
 	}
+	options["option"] = strings.Join(warmupOtions, " ")
+	options["timeout"] = timeout
 
 	dataloadInfo.Options = options