From 3b735b4b026f5550fede57e1c35d891710c113ba Mon Sep 17 00:00:00 2001 From: wei liu Date: Fri, 2 Aug 2024 11:12:14 +0800 Subject: [PATCH] enhance: Refine param init for MmapDirPath (#35181) Signed-off-by: Wei Liu --- internal/util/initcore/init_core.go | 7 ------- pkg/util/paramtable/component_param.go | 7 +++++++ pkg/util/paramtable/component_param_test.go | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/internal/util/initcore/init_core.go b/internal/util/initcore/init_core.go index 86d7071613..700660816e 100644 --- a/internal/util/initcore/init_core.go +++ b/internal/util/initcore/init_core.go @@ -173,13 +173,6 @@ func InitRemoteChunkManager(params *paramtable.ComponentParam) error { func InitMmapManager(params *paramtable.ComponentParam) error { mmapDirPath := params.QueryNodeCfg.MmapDirPath.GetValue() - if len(mmapDirPath) == 0 { - paramtable.Get().Save( - paramtable.Get().QueryNodeCfg.MmapDirPath.Key, - path.Join(paramtable.Get().LocalStorageCfg.Path.GetValue(), "mmap"), - ) - mmapDirPath = paramtable.Get().QueryNodeCfg.MmapDirPath.GetValue() - } cMmapChunkManagerDir := C.CString(path.Join(mmapDirPath, "/mmap_chunk_manager/")) cCacheReadAheadPolicy := C.CString(params.QueryNodeCfg.ReadAheadPolicy.GetValue()) defer C.free(unsafe.Pointer(cMmapChunkManagerDir)) diff --git a/pkg/util/paramtable/component_param.go b/pkg/util/paramtable/component_param.go index e91eb883e3..41265dae09 100644 --- a/pkg/util/paramtable/component_param.go +++ b/pkg/util/paramtable/component_param.go @@ -19,6 +19,7 @@ package paramtable import ( "fmt" "os" + "path" "strconv" "strings" "sync" @@ -2496,6 +2497,12 @@ This defaults to true, indicating that Milvus creates temporary index for growin DefaultValue: "", FallbackKeys: []string{"queryNode.mmapDirPath"}, Doc: "The folder that storing data files for mmap, setting to a path will enable Milvus to load data with mmap", + Formatter: func(v string) string { + if len(v) == 0 { + return path.Join(base.Get("localStorage.path"), "mmap") + } + return v + }, } p.MmapDirPath.Init(base.mgr) diff --git a/pkg/util/paramtable/component_param_test.go b/pkg/util/paramtable/component_param_test.go index 8204c87182..33fc7466d0 100644 --- a/pkg/util/paramtable/component_param_test.go +++ b/pkg/util/paramtable/component_param_test.go @@ -443,6 +443,7 @@ func TestComponentParam(t *testing.T) { assert.Equal(t, 3*time.Second, Params.LazyLoadRequestResourceRetryInterval.GetAsDuration(time.Millisecond)) assert.Equal(t, 4, Params.BloomFilterApplyParallelFactor.GetAsInt()) + assert.Equal(t, "/var/lib/milvus/data/mmap", Params.MmapDirPath.GetValue()) }) t.Run("test dataCoordConfig", func(t *testing.T) {