final changes for 25.10+ object_disk.VersionFullObjectKey=5, fix #1290, add syncWriter to log_helper.go

Signed-off-by: Slach <[email protected]>

Author: Slach

pkg/backup/create.go

@@ -1044,11 +1044,6 @@ func (b *Backuper) uploadObjectDiskParts(ctx context.Context, backupName string,
 				}
 				var copyObjectErr error
 
-				// 25.10+ contains full path need make it relative, https://github.com/Altinity/clickhouse-backup/issues/1290
-				if storageObject.IsAbsolute && srcDiskConnection.GetRemotePath() != "" && srcDiskConnection.GetRemotePath() != "/" && strings.Contains(storageObject.ObjectPath, srcDiskConnection.GetRemotePath()) {
-					storageObject.ObjectPath = strings.TrimPrefix(storageObject.ObjectPath, srcDiskConnection.GetRemotePath())
-				}
-
 				srcKey := path.Join(srcDiskConnection.GetRemotePath(), storageObject.ObjectPath)
 
 				if b.resume {

pkg/backup/restore.go

@@ -2123,7 +2123,7 @@ func (b *Backuper) downloadObjectDiskParts(ctx context.Context, backupName strin
 							if objectDiskPathErr != nil {
 								return objectDiskPathErr
 							}
-							// 25.10+ contains full path, need make it relative again, for properly copy, https://github.com/Altinity/clickhouse-backup/issues/1290
+							// 25.10+ contains full path, need make it relative again after rewrite, for properly copy, https://github.com/Altinity/clickhouse-backup/issues/1290
 							if storageObject.IsAbsolute {
 								objPathParts := strings.Split(storageObject.ObjectPath, "/")
 								if len(objPathParts) >= 2 {

pkg/log_helper/log_helper.go

@@ -176,5 +176,5 @@ func SetupLogger(out io.Writer) zerolog.Logger {
 	}
 	// Use custom writer
 	writer := NewCustomWriter(out)
-	return zerolog.New(writer).With().Timestamp().Caller().Logger()
+	return zerolog.New(zerolog.SyncWriter(writer)).With().Timestamp().Caller().Logger()
 }

pkg/storage/object_disk/object_disk.go

@@ -130,6 +130,14 @@ func (m *Metadata) readFromFile(file io.Reader) error {
 
 		scanner.Scan()
 		storageObject.ObjectPath = scanner.Text()
+		// 25.10+ contains full path, need make it relative again, for properly backup/restore/delete, https://github.com/Altinity/clickhouse-backup/issues/1290
+		if storageObject.IsAbsolute {
+			objPathParts := strings.Split(storageObject.ObjectPath, "/")
+			if len(objPathParts) >= 2 {
+				storageObject.ObjectPath = strings.Join(objPathParts[len(objPathParts)-2:], "/")
+			}
+		}
+
 		m.StorageObjects = append(m.StorageObjects, storageObject)
 	}