fix upload / download files from projections multiple times, cause ba…

…ckup create wrong create *.proj as separate data part, fix #622
Altinity · Mar 30, 2023 · de8f066 · de8f066
1 parent 2bee092
commit de8f066
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -3,7 +3,7 @@ IMPROVEMENTS
 - add additional server-side encryption parameters to s3 config section, fix [619](https://github.com/AlexAkulov/clickhouse-backup/issues/619)
 BUG FIXES
 - fix error after restart API server when .state file present in backup folder, fix [623](https://github.com/AlexAkulov/clickhouse-backup/issues/623)
-
+- fix upload / download files from projections multiple times, cause  backup create wrong create *.proj as separate data part, fix [622](https://github.com/AlexAkulov/clickhouse-backup/issues/622)
 
 # v2.2.0
 IMPROVEMENTS

diff --git a/pkg/filesystemhelper/filesystemhelper.go b/pkg/filesystemhelper/filesystemhelper.go
@@ -195,10 +195,13 @@ func MoveShadow(shadowPath, backupPartsPath string, partitionsBackupMap common.E
 	size := int64(0)
 	parts := make([]metadata.Part, 0)
 	err := filepath.Walk(shadowPath, func(filePath string, info os.FileInfo, err error) error {
-		relativePath := strings.Trim(strings.TrimPrefix(filePath, shadowPath), "/")
-		pathParts := strings.SplitN(relativePath, "/", 4)
+		// possible relative path
 		// store / 1f9 / 1f9dc899-0de9-41f8-b95c-26c1f0d67d93 / 20181023_2_2_0 / checksums.txt
+		// store / 1f9 / 1f9dc899-0de9-41f8-b95c-26c1f0d67d93 / 20181023_2_2_0 / x.proj / checksums.txt
 		// data / database / table / 20181023_2_2_0 / checksums.txt
+		// data / database / table / 20181023_2_2_0 / x.proj / checksums.txt
+		relativePath := strings.Trim(strings.TrimPrefix(filePath, shadowPath), "/")
+		pathParts := strings.SplitN(relativePath, "/", 4)
 		if len(pathParts) != 4 {
 			return nil
 		}
@@ -207,9 +210,11 @@ func MoveShadow(shadowPath, backupPartsPath string, partitionsBackupMap common.E
 		}
 		dstFilePath := filepath.Join(backupPartsPath, pathParts[3])
 		if info.IsDir() {
-			parts = append(parts, metadata.Part{
-				Name: pathParts[3],
-			})
+			if !strings.HasSuffix(pathParts[3], ".proj") {
+				parts = append(parts, metadata.Part{
+					Name: pathParts[3],
+				})
+			}
 			return os.MkdirAll(dstFilePath, 0750)
 		}
 		if !info.Mode().IsRegular() {