Merge pull request #283 from tbs60/dev_tming

Dev tming
TencentBlueKing · Aug 22, 2024 · 2652533 · 2652533
2 parents ee07b06 + 0fa10c9
commit 2652533
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/backend/booster/bk_dist/common/sdk/toolchain.go b/src/backend/booster/bk_dist/common/sdk/toolchain.go
@@ -128,14 +128,27 @@ func checkAndAdd(i *dcFile.Info, remotepath string, files *[]FileDesc) error {
 // 得到所有关联文件；如果是链接，则递归搜索，直到找到非链接为止
 // 如果发现链接循环，则报错
 func getRecursiveFiles(f string, remotepath string, files *[]FileDesc) error {
+	// 如果远端路径和本地不一致，则需要将链接替换为真实文件发送过去
+	localdir := filepath.Dir(f)
+	if localdir != remotepath {
+		i := dcFile.Stat(f)
+		if !i.Exist() {
+			err := fmt.Errorf("file %s not existed", f)
+			blog.Errorf("%v", err)
+			return err
+		}
+
+		return checkAndAdd(i, remotepath, files)
+	}
+
 	i := dcFile.Lstat(f)
 	if !i.Exist() {
 		err := fmt.Errorf("file %s not existed", f)
 		blog.Errorf("%v", err)
 		return err
 	}
 
-	// 链接，需要递归
+	// 如果远端路径和本地一致，则将链接相关的文件都包含进来
 	if i.Basic().Mode()&os.ModeSymlink != 0 {
 		originFile, err := os.Readlink(f)
 		if err == nil {
@@ -247,7 +260,7 @@ func (t *Toolchain) ToFileDesc() ([]FileDesc, error) {
 		}
 	}
 
-	blog.Infof("toolchain: get all files:%v", toolfiles)
+	blog.Debugf("toolchain: get all files:%v", toolfiles)
 
 	return toolfiles, nil
 }

diff --git a/src/backend/booster/bk_dist/controller/pkg/manager/remote/mgr.go b/src/backend/booster/bk_dist/controller/pkg/manager/remote/mgr.go
@@ -1614,7 +1614,7 @@ func (m *Mgr) getToolFileInfoByKey(key string) *types.FileCollectionInfo {
 		blog.Infof("remote: ready get relative toolchain files for %s", key)
 		toolchainfiles, timestamp, err := m.work.Basic().GetToolChainRelativeFiles(key)
 		if err == nil && len(toolchainfiles) > 0 {
-			blog.Infof("remote: got toolchain files for %s:%v", key, toolchainfiles)
+			blog.Debugf("remote: got toolchain files for %s:%v", key, toolchainfiles)
 			return &types.FileCollectionInfo{
 				UniqID:     key,
 				Files:      toolchainfiles,
@@ -1626,7 +1626,7 @@ func (m *Mgr) getToolFileInfoByKey(key string) *types.FileCollectionInfo {
 		blog.Infof("remote: ready get normal toolchain files for %s", key)
 		toolchainfiles, timestamp, err := m.work.Basic().GetToolChainFiles(key)
 		if err == nil && len(toolchainfiles) > 0 {
-			blog.Infof("remote: got toolchain files for %s:%v", key, toolchainfiles)
+			blog.Debugf("remote: got toolchain files for %s:%v", key, toolchainfiles)
 			return &types.FileCollectionInfo{
 				UniqID:     key,
 				Files:      toolchainfiles,