fix DCO

Signed-off-by: zwwhdls <[email protected]>
fluid-cloudnative · Mar 18, 2022 · 6b05bc1 · 6b05bc1
1 parent 4a5b3ea
commit 6b05bc1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/charts/fluid-dataloader/juicefs/templates/dataloader.yaml b/charts/fluid-dataloader/juicefs/templates/dataloader.yaml
@@ -18,6 +18,7 @@ metadata:
   labels:
     release: {{ .Release.Name }}
     role: dataload-job
+    app: juicefs
     targetDataset: {{ required "targetDataset should be set" .Values.dataloader.targetDataset }}
 spec:
   backoffLimit: {{ .Values.dataloader.backoffLimit | default "3" }}

diff --git a/charts/fluid-dataloader/juicefs/values.yaml b/charts/fluid-dataloader/juicefs/values.yaml
@@ -31,4 +31,4 @@ dataloader:
 
 podNames:
   - ""
-namespace: ""
+namespace: ""
diff --git a/pkg/ddc/juicefs/data_load.go b/pkg/ddc/juicefs/data_load.go
@@ -132,10 +132,8 @@ func (e *JuiceFSEngine) generateDataLoadValueFile(r cruntime.ReconcileRequestCon
 	if err != nil {
 		return
 	}
-	if cacheinfo != nil {
-		for key, value := range cacheinfo {
-			options[key] = value
-		}
+	for key, value := range cacheinfo {
+		options[key] = value
 	}
 
 	dataloadInfo.Options = options
@@ -193,9 +191,9 @@ func (e *JuiceFSEngine) CheckExistenceOfPath(targetDataload datav1alpha1.DataLoa
 	if err != nil {
 		return
 	}
-	mountPath := ""
-	if cacheinfo != nil {
-		mountPath = cacheinfo[MOUNTPATH]
+	mountPath := cacheinfo[MOUNTPATH]
+	if mountPath == "" {
+		return true, fmt.Errorf("fail to find mountpath in dataset %s %s", targetDataload.Spec.Dataset.Name, targetDataload.Spec.Dataset.Namespace)
 	}
 
 	// get fuse pod