Merge branch 'master' into dev-joelei-embed

TencentBlueKing · Oct 25, 2023 · a83f934 · a83f934
2 parents c3d12fb + b36f62e
commit a83f934
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/backend/booster/bk_dist/shadertool/pkg/shadertool.go b/src/backend/booster/bk_dist/shadertool/pkg/shadertool.go
@@ -342,8 +342,6 @@ func (h *ShaderTool) server(ctx context.Context) error {
 
 // execute actions got from ready queue
 func (h *ShaderTool) tryExecuteActions(ctx context.Context) error {
-	// blog.Debugf("ShaderTool: try to run actions")
-
 	if h.actionlist.Len() <= 0 {
 		return nil
 	}
@@ -389,7 +387,7 @@ func (h *ShaderTool) tryExecuteActions(ctx context.Context) error {
 	}
 
 	// execute actions no more than max jobs
-	blog.Infof("ShaderTool: try to run actions with %d jobs", h.maxjobs)
+	blog.Infof("ShaderTool: try to run actions up to %d jobs", h.maxjobs)
 	h.actionchan = make(chan common.Actionresult, h.maxjobs)
 
 	// execute first batch actions
@@ -832,7 +830,7 @@ func (h *ShaderTool) shaders(actions *common.UE4Action) error {
 		h.actionindex++
 		h.actionlist.PushBack(&temp)
 	}
-	blog.Infof("ShaderTool: got total %d shader jobs", h.actionlist.Len())
+	blog.Infof("ShaderTool: got %d shader jobs, total jobs in queue: %d", len(actions.Actions), h.actionlist.Len())
 
 	// awake action execution
 	if h.actionchan != nil {

diff --git a/src/backend/booster/bk_dist/ubttool/pkg/ubttool.go b/src/backend/booster/bk_dist/ubttool/pkg/ubttool.go
@@ -181,8 +181,6 @@ func (h *UBTTool) runActions() error {
 
 // execute actions got from ready queue
 func (h *UBTTool) executeActions() error {
-	blog.Infof("UBTTool: try to run actions")
-
 	h.maxjobs = DefaultJobs
 
 	// get max jobs from env
@@ -199,7 +197,7 @@ func (h *UBTTool) executeActions() error {
 	// h.dump()
 
 	// execute actions no more than max jobs
-	blog.Infof("UBTTool: try to run actions with %d jobs", h.maxjobs)
+	blog.Infof("UBTTool: try to run actions up to %d jobs", h.maxjobs)
 	h.actionchan = make(chan common.Actionresult, h.maxjobs)
 
 	// execute first batch actions
@@ -561,7 +559,7 @@ func (h *UBTTool) dump() {
 	blog.Infof("UBTTool: -------------------dump end-----------------------")
 }
 
-//---------------------------------to support set tool chain----------------------------------------------------------
+// ---------------------------------to support set tool chain----------------------------------------------------------
 func (h *UBTTool) initsettings() error {
 	var err error
 	h.projectSettingFile, err = h.getProjectSettingFile()