From 7c07fdbb1df237f2eda53540d88fe6a074e8d0bb Mon Sep 17 00:00:00 2001 From: frankleaf Date: Tue, 1 Mar 2022 16:58:58 +0800 Subject: [PATCH 1/4] enable run jindo dataload synchronously Signed-off-by: frankleaf --- charts/fluid-dataloader/jindo/templates/configmap.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/fluid-dataloader/jindo/templates/configmap.yaml b/charts/fluid-dataloader/jindo/templates/configmap.yaml index 37d18f0d6be..6795e17952b 100644 --- a/charts/fluid-dataloader/jindo/templates/configmap.yaml +++ b/charts/fluid-dataloader/jindo/templates/configmap.yaml @@ -70,7 +70,7 @@ data: fi if [[ $enbaleCacheListLocation == 'false' ]]; then - cmd="$cmd -R -replica $replica $default$path" + cmd="$cmd -s -R -replica $replica $default$path" echo -e "execute cmd $cmd" time $cmd else @@ -80,7 +80,7 @@ data: chmod 755 ossutil64 ./ossutil64 -e $cacheListEndpoint -i $cacheListAccessKeyId -k $cacheListAccessKeySecret cp $cacheListUrl /cachelist.txt echo -e "--- enable File List" - cmd="$cmd -R -replica $cacheListReplica -cachelist /cachelist.txt -thread $cacheListThread $default/" + cmd="$cmd -s -R -replica $cacheListReplica -cachelist /cachelist.txt -thread $cacheListThread $default/" echo -e "execute cmd $cmd" time $cmd fi From dc98ff0e095e5cc905110482bf42346a02a39f89 Mon Sep 17 00:00:00 2001 From: frankleaf Date: Tue, 1 Mar 2022 18:06:55 +0800 Subject: [PATCH 2/4] fix digit to ture/false Signed-off-by: frankleaf --- pkg/ddc/jindo/transform.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/ddc/jindo/transform.go b/pkg/ddc/jindo/transform.go index bf0e93046dc..0c96e1a78c5 100644 --- a/pkg/ddc/jindo/transform.go +++ b/pkg/ddc/jindo/transform.go @@ -372,8 +372,8 @@ func (e *JindoEngine) transformFuse(runtime *datav1alpha1.JindoRuntime, value *J "client.oss.connection.timeout.millisecond": "3000", "client.storage.connect.enable": "true", "jfs.cache.meta-cache.enable": "0", - "jfs.cache.data-cache.enable": "1", - "jfs.cache.data-cache.slicecache.enable": "1", + "jfs.cache.data-cache.enable": "true", + "jfs.cache.data-cache.slicecache.enable": "true", } // "client.storage.rpc.port": "6101", @@ -381,10 +381,10 @@ func (e *JindoEngine) transformFuse(runtime *datav1alpha1.JindoRuntime, value *J if e.getTieredStoreType(runtime) == 0 { // MEM - properties["jfs.cache.ram-cache.enable"] = "1" + properties["jfs.cache.ram-cache.enable"] = "true" } else if e.getTieredStoreType(runtime) == 1 || e.getTieredStoreType(runtime) == 2 { // HDD and SSD - properties["jfs.cache.ram-cache.enable"] = "0" + properties["jfs.cache.ram-cache.enable"] = "false" } if len(runtime.Spec.Fuse.Properties) > 0 { @@ -469,7 +469,7 @@ func (e *JindoEngine) transformWorkerMountPath(originPath []string) map[string]s } func (e *JindoEngine) transformFuseArg(runtime *datav1alpha1.JindoRuntime, dataset *datav1alpha1.Dataset) []string { - var baseArg = "-okernel_cache -oattr_timeout=9000 -oentry_timeout=9000" + var baseArg = "-okernel_cache" var rootArg = "" var secretArg = "" if len(dataset.Spec.Mounts) > 0 && dataset.Spec.Mounts[0].Path != "" { From c06bd37bfae8bc160e06d4a77d1ac56d0c7facdc Mon Sep 17 00:00:00 2001 From: frankleaf Date: Tue, 1 Mar 2022 18:42:59 +0800 Subject: [PATCH 3/4] fix test Signed-off-by: frankleaf --- api/v1alpha1/zz_generated.deepcopy.go | 1 - pkg/ddc/jindo/transform_fuse_test.go | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index ad59e459668..b1c8ebfc67f 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,3 @@ -//go:build !ignore_autogenerated // +build !ignore_autogenerated /* diff --git a/pkg/ddc/jindo/transform_fuse_test.go b/pkg/ddc/jindo/transform_fuse_test.go index fedf3879eb3..3013d848a1d 100644 --- a/pkg/ddc/jindo/transform_fuse_test.go +++ b/pkg/ddc/jindo/transform_fuse_test.go @@ -131,7 +131,7 @@ func TestTransformFuseArg(t *testing.T) { Name: "test", Path: "/", }}, - }}, &Jindo{}, "-ocredential_provider=secrets:///token/ -oroot_ns=jindo -okernel_cache -oattr_timeout=9000 -oentry_timeout=9000"}, + }}, &Jindo{}, "-ocredential_provider=secrets:///token/ -oroot_ns=jindo -okernel_cache"}, } for _, test := range tests { engine := &JindoEngine{Log: log.NullLogger{}} From cd417f03feb8b66dad21eb570f5fc7a9c799f79e Mon Sep 17 00:00:00 2001 From: frankleaf Date: Tue, 1 Mar 2022 18:56:00 +0800 Subject: [PATCH 4/4] fix test Signed-off-by: frankleaf --- pkg/ddc/jindo/transform_fuse_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/ddc/jindo/transform_fuse_test.go b/pkg/ddc/jindo/transform_fuse_test.go index 3013d848a1d..5ef485d4ef0 100644 --- a/pkg/ddc/jindo/transform_fuse_test.go +++ b/pkg/ddc/jindo/transform_fuse_test.go @@ -37,7 +37,7 @@ func TestTransformFuseWithNoArgs(t *testing.T) { MountPoint: "local:///mnt/test", Name: "test", }}, - }}, &Jindo{}, "1"}, + }}, &Jindo{}, "true"}, } for _, test := range tests { engine := &JindoEngine{Log: log.NullLogger{}}