Refactor func ThinEngine.transformFuseConfig

Signed-off-by: trafalgarzzz <trafalgarz@outlook.com>
fluid-cloudnative · May 8, 2024 · 0fd8fd3 · 0fd8fd3
1 parent 4aa5401
commit 0fd8fd3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/pkg/ddc/thin/transform_config.go b/pkg/ddc/thin/transform_config.go
@@ -43,7 +43,7 @@ func getFuseConfigStorage() string {
 	return "configmap"
 }
 
-func (t *ThinEngine) transformFuseConfig(runtime *datav1alpha1.ThinRuntime, dataset *datav1alpha1.Dataset, value *ThinValue) (string, error) {
+func (t *ThinEngine) transformFuseConfig(runtime *datav1alpha1.ThinRuntime, dataset *datav1alpha1.Dataset, value *ThinValue) (error) {
 	fuseConfigStorage := getFuseConfigStorage()
 
 	mounts := []datav1alpha1.Mount{}
@@ -55,7 +55,7 @@ func (t *ThinEngine) transformFuseConfig(runtime *datav1alpha1.ThinRuntime, data
 			pvcName := strings.TrimPrefix(m.MountPoint, common.VolumeScheme.String())
 			csiInfo, mountOptions, err := t.extractVolumeInfo(pvcName)
 			if err != nil {
-				return "", errors.Wrapf(err, "failed to extract volume info from PersistentVolumeClaim \"%s\"", pvcName)
+				return errors.Wrapf(err, "failed to extract volume info from PersistentVolumeClaim \"%s\"", pvcName)
 			}
 
 			pvAttributes[pvcName] = csiInfo
@@ -64,7 +64,7 @@ func (t *ThinEngine) transformFuseConfig(runtime *datav1alpha1.ThinRuntime, data
 
 		options, err := t.extractMountOptions(m, dataset, fuseConfigStorage, value)
 		if err != nil {
-			return "", err
+			return err
 		}
 		m.Options = options
 		m.EncryptOptions = nil
@@ -86,11 +86,11 @@ func (t *ThinEngine) transformFuseConfig(runtime *datav1alpha1.ThinRuntime, data
 	var configStr []byte
 	configStr, err := json.Marshal(config)
 	if err != nil {
-		return "", errors.Wrapf(err, "failed to dump fuse config to json, runtime: \"%s/%s\"", runtime.Namespace, runtime.Name)
+		return errors.Wrapf(err, "failed to dump fuse config to json, runtime: \"%s/%s\"", runtime.Namespace, runtime.Name)
 	}
 	value.Fuse.ConfigValue = string(configStr)
 	value.Fuse.ConfigStorage = fuseConfigStorage
-	return string(configStr), nil
+	return nil
 }
 
 func (t *ThinEngine) transformEncryptOptionsWithSecretVolumes(m datav1alpha1.Mount, sharedEncryptOptions []datav1alpha1.EncryptOption, value *ThinValue) (options map[string]string) {

diff --git a/pkg/ddc/thin/transform_fuse.go b/pkg/ddc/thin/transform_fuse.go
@@ -111,7 +111,7 @@ func (t *ThinEngine) transformFuse(runtime *datav1alpha1.ThinRuntime, profile *d
 	}
 
 	// 12. fuse config
-	_, err = t.transformFuseConfig(runtime, dataset, value)
+	err = t.transformFuseConfig(runtime, dataset, value)
 	if err != nil {
 		return err
 	}

diff --git a/pkg/ddc/thin/ufs.go b/pkg/ddc/thin/ufs.go
@@ -104,15 +104,16 @@ func (t ThinEngine) updateFuseConfigOnChange(runtime *datav1alpha1.ThinRuntime,
 		return update, nil
 	}
 
-	configStr, err := t.transformFuseConfig(runtime, dataset, &ThinValue{})
+	updatedThinValue := &ThinValue{}
+	err = t.transformFuseConfig(runtime, dataset, updatedThinValue)
 	if err != nil {
 		return update, nil
 	}
 
 	fuseConfigMapToUpdate := fuseConfigMap.DeepCopy()
-	fuseConfigMapToUpdate.Data["config.json"] = configStr
+	fuseConfigMapToUpdate.Data["config.json"] = updatedThinValue.Fuse.ConfigValue
 	if !reflect.DeepEqual(fuseConfigMap, fuseConfigMapToUpdate) {
-		t.Log.Info("Update fuse config", "fuse config", configStr)
+		t.Log.Info("Update fuse config", "fuse config", updatedThinValue.Fuse.ConfigValue)
 		err = kubeclient.UpdateConfigMap(t.Client, fuseConfigMapToUpdate)
 		if err != nil {
 			return update, err