未验证 提交 0ad79662 编写于 作者: P Petrus 提交者: GitHub

fix not clean cache files when load helm service from gitee (#2993)

Signed-off-by: NPatrick Zhao <zhaoyu@koderover.com>
上级 d33dd8e6
......@@ -92,7 +92,7 @@ func SaveAndUploadFiles(fileTree fs.FS, names []string, localBase, s3Base string
// CopyAndUploadFiles copy a tree of files to other dir, at the same time, archives them and uploads to object storage.
func CopyAndUploadFiles(names []string, localBase, s3Base, zipPath, currentChartPath string, logger *zap.SugaredLogger) error {
err := copy.Copy(currentChartPath, localBase)
err := copyFilesToDisk(currentChartPath, localBase, logger)
if err != nil {
logger.Errorf("failed to copy chart info, err %s", err)
return err
......@@ -142,3 +142,37 @@ func saveInMemoryFilesToDisk(fileTree fs.FS, root string, logger *zap.SugaredLog
return nil
}
func copyFilesToDisk(src, dest string, logger *zap.SugaredLogger) error {
ok, err := fsutil.DirExists(dest)
if err != nil {
return err
}
if !ok {
return copy.Copy(src, dest)
}
tmpDest := dest + ".bak"
if err = os.Rename(dest, tmpDest); err != nil {
return err
}
if err = copy.Copy(src, dest); err != nil {
logger.Errorf("Failed to copy %s to %s, err: %s", src, dest, err)
if err1 := os.RemoveAll(dest); err1 != nil {
logger.Warnf("Failed to delete path %s, err: %s", dest, err1)
}
if err1 := os.Rename(tmpDest, dest); err1 != nil {
logger.Errorf("Failed to rename path from %s to %s, err: %s", tmpDest, dest, err1)
}
return err
}
if err := os.RemoveAll(tmpDest); err != nil {
logger.Warnf("Failed to delete path %s, err: %s", tmpDest, err)
}
return nil
}
......@@ -121,7 +121,6 @@ func PreLoadServiceManifests(base string, svc *commonmodels.Service, production
if ok {
return nil
}
log.Debugf("base: %s, svc: %+v, production %v", base, svc, production)
if err = DownloadServiceManifests(base, svc.ProductName, svc.ServiceName, production); err == nil {
return nil
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册