Remove cache dir from sidecar pod (#1462)

* Remove cache dir, To #39482462 Signed-off-by: cheyang <[email protected]> * Remove cache dir, To #39482462 Signed-off-by: cheyang <[email protected]> * Remove cache dir, To #39482462 Signed-off-by: cheyang <[email protected]> * Add Fuse container sidecar test, To #37688693 Signed-off-by: cheyang <[email protected]> * Add Fuse container sidecar test, To #37688693 Signed-off-by: cheyang <[email protected]>
fluid-cloudnative · Feb 25, 2022 · 0edad98 · 0edad98
1 parent 109ba96
commit 0edad98
Show file tree

Hide file tree

Showing 9 changed files with 642 additions and 10 deletions.
diff --git a/pkg/application/inject/fuse/injector.go b/pkg/application/inject/fuse/injector.go
@@ -153,13 +153,14 @@ func (s *Injector) inject(in runtime.Object, pvcName string, runtimeInfo base.Ru
 		}
 
 		// if it's not serverless enable or injection is done, skip
-		if !utils.ServerlessEnabled(metaObj.Labels) || utils.SidecarInjectDone(metaObj.Labels) {
+		if !utils.ServerlessEnabled(metaObj.Labels) || utils.InjectSidecarDone(metaObj.Labels) {
 			continue
 		}
 
 		// 1. check if the pod spec has fluid volume claim
 		injectFuseContainer := true
-		template, err := runtimeInfo.GetTemplateToInjectForFuse(pvcName)
+		enableCacheDir := utils.InjectCacheDirEnabled(metaObj.Labels)
+		template, err := runtimeInfo.GetTemplateToInjectForFuse(pvcName, enableCacheDir)
 		if err != nil {
 			return out, err
 		}

diff --git a/pkg/common/constants.go b/pkg/common/constants.go
@@ -117,6 +117,7 @@ const (
 	injectSidecar          = ".sidecar" + inject
 	InjectServerless       = "serverless" + inject
 	InjectFuseSidecar      = "fuse" + injectSidecar
+	InjectCacheDir         = "cachedir" + injectSidecar
 	InjectWorkerSidecar    = "worker" + injectSidecar
 	InjectSidecarDone      = "done" + injectSidecar
 )
diff --git a/pkg/ddc/base/runtime.go b/pkg/ddc/base/runtime.go
@@ -77,7 +77,7 @@ type RuntimeInfoInterface interface {
 
 	IsDeprecatedPVName() bool
 
-	GetTemplateToInjectForFuse(pvcName string) (*common.FuseInjectionTemplate, error)
+	GetTemplateToInjectForFuse(pvcName string, enableCache bool) (*common.FuseInjectionTemplate, error)
 
 	SetClient(client client.Client)
 }

diff --git a/pkg/ddc/base/runtime_helper.go b/pkg/ddc/base/runtime_helper.go
@@ -31,8 +31,15 @@ import (
 	"k8s.io/apimachinery/pkg/types"
 )
 
+var (
+	// datavolume- for JindoFS
+	// mem, ssd, hdd for Alluxio and GooseFS
+	// cache-dir for JuiceFS
+	cacheDirNames = []string{"datavolume-", "cache-dir", "mem", "ssd", "hdd"}
+)
+
 // GetTemplateToInjectForFuse gets template for fuse injection
-func (info *RuntimeInfo) GetTemplateToInjectForFuse(pvcName string) (template *common.FuseInjectionTemplate, err error) {
+func (info *RuntimeInfo) GetTemplateToInjectForFuse(pvcName string, enableCacheDir bool) (template *common.FuseInjectionTemplate, err error) {
 	// TODO: create fuse container
 	ds, err := info.getFuseDaemonset()
 	if err != nil {
@@ -51,15 +58,21 @@ func (info *RuntimeInfo) GetTemplateToInjectForFuse(pvcName string) (template *c
 		UID:        dataset.UID,
 	}
 
+	// 0. remove the cache dir if required
+	if len(ds.Spec.Template.Spec.Containers) != 1 {
+		return template, fmt.Errorf("the length of containers of fuse %s in namespace %s is not 1", ds.Name, ds.Namespace)
+	}
+	if !enableCacheDir {
+		ds.Spec.Template.Spec.Containers[0].VolumeMounts = utils.TrimVolumeMounts(ds.Spec.Template.Spec.Containers[0].VolumeMounts, cacheDirNames)
+		ds.Spec.Template.Spec.Volumes = utils.TrimVolumes(ds.Spec.Template.Spec.Volumes, cacheDirNames)
+	}
+
 	// 1. set the pvc name
 	template = &common.FuseInjectionTemplate{
 		PVCName: pvcName,
 	}
 
 	// 2. set the fuse container
-	if len(ds.Spec.Template.Spec.Containers) != 1 {
-		return template, fmt.Errorf("the length of containers of fuse %s in namespace %s is not 1", ds.Name, ds.Namespace)
-	}
 	template.FuseContainer = ds.Spec.Template.Spec.Containers[0]
 	template.FuseContainer.Name = common.FuseContainerName