Merge branch 'master' into dev_tming_p2p

TencentBlueKing · Apr 25, 2024 · 86442ae · 86442ae
2 parents 41fa845 + b340bdf
commit 86442ae
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/src/backend/booster/bk_dist/booster/pkg/booster.go b/src/backend/booster/bk_dist/booster/pkg/booster.go
@@ -341,6 +341,11 @@ func (b *Booster) getWorkersEnv() map[string]string {
 		requiredEnv[env.KeyExecutorForceLocalKeys] = strings.Join(b.config.Works.ForceLocalList, env.CommonBKEnvSepKey)
 	}
 
+	ccEnsureOwnerVal := env.GetEnv(env.KeyExecutorCCEnsureFileOwnerkey)
+	if ccEnsureOwnerVal != "" {
+		requiredEnv[env.KeyExecutorCCEnsureFileOwnerkey] = ccEnsureOwnerVal
+	}
+
 	if b.config.Works.WriteMemroy {
 		requiredEnv[env.KeyExecutorWriteMemory] = envValueTrue
 	}

diff --git a/src/backend/booster/bk_dist/common/env/env.go b/src/backend/booster/bk_dist/common/env/env.go
@@ -54,6 +54,7 @@ const (
 	KeyExecutorPumpSearchLinkResult    = "PUMP_SEARCH_LINK_RESULT"
 	KeyExecutorPumpLstatByDir          = "PUMP_LSTAT_BY_DIR"
 	KeyExecutorForceLocalKeys          = "FORCE_LOCAL_KEYS"
+	KeyExecutorCCEnsureFileOwnerkey    = "CC_ENSURE_OWNER"
 	KeyExecutorEnvProfile              = "ENV_PROFILE"
 	KeyExecutorWorkerSideCache         = "WORKER_SIDE_CACHE"
 	KeyExecutorLocalRecord             = "LOCAL_RECORD"

diff --git a/src/backend/booster/bk_dist/handler/cc/booster.go b/src/backend/booster/bk_dist/handler/cc/booster.go
@@ -56,6 +56,7 @@ var bazelActionConstOptions = []string{
 	env.GetEnvKey(env.BoosterType),
 	env.GetEnvKey(env.KeyExecutorIOTimeout),
 	env.GetEnvKey(env.KeyExecutorForceLocalKeys),
+	env.GetEnvKey(env.KeyExecutorCCEnsureFileOwnerkey),
 }
 
 func appendPreload() error {

diff --git a/src/backend/booster/bk_dist/handler/cc/utils.go b/src/backend/booster/bk_dist/handler/cc/utils.go
@@ -912,7 +912,12 @@ func getOutputFile(args []string, sandbox *dcSyscall.Sandbox) []string {
 	seenFprofileDir := false
 	var inputFile string
 	var outputFile string
-
+	// transfer input args if an arg is a file
+	args, err := expandOptions(sandbox, args)
+	if err != nil {
+		blog.Warnf("cc: [%v] getOutputFile expand options: %v", args, err)
+		return nil
+	}
 	for index := 0; index < len(args); index++ {
 		arg := args[index]