Merge branch 'master' into dev_tming

TencentBlueKing · Nov 22, 2024 · 9349e15 · 9349e15
2 parents 25ec8a3 + 5becd79
commit 9349e15
Show file tree

Hide file tree

Showing 12 changed files with 545 additions and 252 deletions.
diff --git a/src/backend/booster/bk_dist/booster/pkg/booster.go b/src/backend/booster/bk_dist/booster/pkg/booster.go
@@ -24,7 +24,6 @@ import (
 	"time"
 
 	"github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/common/env"
-	dcFile "github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/common/file"
 	dcProtocol "github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/common/protocol"
 	dcPump "github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/common/pump"
 	dcSDK "github.com/TencentBlueKing/bk-turbo/src/backend/booster/bk_dist/common/sdk"
@@ -634,7 +633,7 @@ func (b *Booster) unregisterWork() error {
 	return nil
 }
 
-func (b *Booster) sendAdditionFile() {
+/*func (b *Booster) sendAdditionFile() {
 	if b.config.Works.Local || b.config.Works.Degraded {
 		return
 	}
@@ -683,7 +682,7 @@ func (b *Booster) sendAdditionFile() {
 		return
 	}
 	blog.Infof("booster: finish send addition files: %v", b.config.Works.AdditionFiles)
-}
+}*/
 
 func (b *Booster) runWorks(
 	ctx context.Context,

diff --git a/src/backend/booster/bk_dist/common/sdk/worker.go b/src/backend/booster/bk_dist/common/sdk/worker.go
@@ -96,6 +96,7 @@ type FileDesc struct {
 	NoDuplicated       bool                  `json:"no_duplicated"`
 	AllDistributed     bool                  `json:"all_distributed"`
 	Priority           FileDescPriority      `json:"priority"`
+	Retry              bool                  `json:"retry"`
 }
 
 // UniqueKey define the file unique key