feat:support result cache, issue: #315

TencentBlueKing · Jan 20, 2025 · ff38c8f · ff38c8f
1 parent 96fe3e9
commit ff38c8f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/backend/booster/bk_dist/common/resultcache/filemgr.go b/src/backend/booster/bk_dist/common/resultcache/filemgr.go
@@ -81,7 +81,7 @@ func (f *FileMgrWithARC) load() {
 	defer f.mutexARC.Unlock()
 
 	// filedir / groupkey / hash[0] / hash[1] / hash / files..
-	// 搜索 filedir 下的所有4层子目录
+	// 搜索 filedir 下的所有第4层子目录
 	baselen := getPathDepth(f.filedir)
 	filepath.Walk(f.filedir, func(path string, info os.FileInfo, err error) error {
 		if err != nil {
@@ -90,8 +90,8 @@ func (f *FileMgrWithARC) load() {
 
 		if info.IsDir() {
 			curpathlen := getPathDepth(path)
-			if curpathlen-baselen == 3 {
-				dir := filepath.Join(path, info.Name())
+			if curpathlen-baselen == 4 {
+				dir := path
 				if strings.HasSuffix(dir, DeleteFlag) {
 					blog.Infof("FileMgrWithARC: load %s to delete cache", dir)
 					f.addDelete(dir)

diff --git a/src/backend/booster/bk_dist/worker/config/config.go b/src/backend/booster/bk_dist/worker/config/config.go
@@ -72,6 +72,8 @@ type WorkerConfig struct {
 	// slot由worker提供，而不是客户端指定
 	OfferSlot bool `json:"offer_slot" value:"true" usage:"whether support offer slot"`
 
+	// result cache switch
+	ResultCache bool `json:"result_cache" value:"false" usage:"whether support result cache"`
 	// result cache dir
 	ResultCacheDir string `json:"result_cache_dir" value:"" usage:"result cache dir"`
 	// max result files

diff --git a/src/backend/booster/bk_dist/worker/main.go b/src/backend/booster/bk_dist/worker/main.go
@@ -14,6 +14,7 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/common/resultcache"
 	"github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/worker/config"
 	"github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/worker/pkg"
 	"github.com/TencentBlueKing/bk-turbo/src/backend/booster/common/blog"
@@ -36,6 +37,11 @@ func main() {
 	config.GlobalResultCacheDir = c.ResultCacheDir
 	config.GlobalMaxFileNumber = c.MaxResultFileNumber
 	config.GlobalMaxIndexNumber = c.MaxResultIndexNumber
+	if c.ResultCache {
+		resultcache.GetInstance(config.GlobalResultCacheDir,
+			config.GlobalMaxFileNumber,
+			config.GlobalMaxIndexNumber)
+	}
 
 	if !filepath.IsAbs(c.LogConfig.LogDir) {
 		newabs, err := filepath.Abs(c.LogConfig.LogDir)