feat:support result cache, issue: TencentBlueKing#315

tbs60 · Jan 8, 2025 · d4dcc1c · d4dcc1c
1 parent 867baba
commit d4dcc1c
Show file tree

Hide file tree

Showing 6 changed files with 161 additions and 125 deletions.
diff --git a/src/backend/booster/bk_dist/common/protocol/task_worker.pb.go b/src/backend/booster/bk_dist/common/protocol/task_worker.pb.go
diff --git a/src/backend/booster/bk_dist/common/protocol/task_worker.proto b/src/backend/booster/bk_dist/common/protocol/task_worker.proto
@@ -179,6 +179,8 @@ message PBBodyQueryResultCacheIndexReq {
 
 message PBBodyQueryResultCacheIndexRsp {
 	optional bytes list = 1;   // 列表，可以为空
+	optional PBCompressType compresstype = 2;
+	optional int32 originlength = 3;
 }
 
 message PBBodyQueryResultCacheFileReq {

diff --git a/src/backend/booster/bk_dist/controller/pkg/manager/local/mgr.go b/src/backend/booster/bk_dist/controller/pkg/manager/local/mgr.go
@@ -780,7 +780,3 @@ func (m *Mgr) reportRemoteResultCache(
 
 	return nil, nil
 }
-
-func (m *Mgr) getCacheList() {
-	// m.work.Resource().
-}
diff --git a/src/backend/booster/bk_dist/ubttool/pkg/ubttool.go b/src/backend/booster/bk_dist/ubttool/pkg/ubttool.go
@@ -710,6 +710,7 @@ func (h *UBTTool) newBooster() (*pkg.Booster, error) {
 			MaxLocalPreJobs:   h.settings.MaxLocalPreJobs,
 			MaxLocalExeJobs:   h.settings.MaxLocalExeJobs,
 			MaxLocalPostJobs:  h.settings.MaxLocalPostJobs,
+			ResultCacheList:   h.settings.ResultCacheList,
 		},
 
 		Transport: dcType.BoosterTransport{

diff --git a/src/backend/booster/bk_dist/worker/pkg/client/bkcommondist_protocol.go b/src/backend/booster/bk_dist/worker/pkg/client/bkcommondist_protocol.go
@@ -1656,7 +1656,18 @@ func decodeQueryCacheIndexRsp(
 	}
 
 	if r != nil {
-		result.ResultIndex = r.List
+		data := r.List
+		if *r.Compresstype == protocol.PBCompressType_LZ4 && len(r.List) > 0 && *r.Originlength > 0 {
+			dst := make([]byte, *r.Originlength)
+			outdata, err := dcUtil.Lz4Uncompress(data, dst)
+			if err == nil {
+				data = outdata
+			} else {
+				blog.Warnf("failed to uncompress result cache index data: %v", err)
+				return nil, err
+			}
+		}
+		result.ResultIndex = data
 	}
 
 	return &result, nil

diff --git a/src/backend/booster/bk_dist/worker/pkg/protocol/pb_protocol.go b/src/backend/booster/bk_dist/worker/pkg/protocol/pb_protocol.go
@@ -1467,8 +1467,17 @@ func EncodeBKQueryResultCacheIndexRsp(
 	var filebuflen int64
 
 	// encode body and file to message
+	originlength := int32(len(data))
+	compresseddata := data
+	compresstype := protocol.PBCompressType_NONE
+	if originlength > 0 {
+		compresseddata, _ = dcUtil.Lz4Compress(data)
+		compresstype = protocol.PBCompressType_LZ4
+	}
 	pbbody := protocol.PBBodyQueryResultCacheIndexRsp{
-		List: data,
+		List:         compresseddata,
+		Compresstype: &compresstype,
+		Originlength: &originlength,
 	}
 
 	bodydata, err := proto.Marshal(&pbbody)