skip CopyObject execution for keys which have zero size, to allow pro…

…perly backup S3, GCS over S3 and Azure disks
Altinity · Jan 9, 2024 · 44d00ac · 44d00ac
1 parent f8b1995
commit 44d00ac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.4.16
+BUG FIXES
+- skip CopyObject execution for keys which have zero size, to allow properly backup S3, GCS over S3 and Azure disks
+
 # v2.4.16
 BUG FIXES
 - increase `AZBLOB_TIMEOUT` to 4h, instead 15m to allow download long size data parts 

diff --git a/pkg/backup/create.go b/pkg/backup/create.go
@@ -657,6 +657,9 @@ func (b *Backuper) uploadObjectDiskParts(ctx context.Context, backupName, backup
 
 		uploadObjectDiskPartsWorkingGroup.Go(func() error {
 			for _, storageObject := range objPartFileMeta.StorageObjects {
+				if storageObject.ObjectSize == 0 {
+					continue
+				}
 				if objSize, err = b.dst.CopyObject(
 					ctx,
 					srcDiskConnection.GetRemoteBucket(),

diff --git a/pkg/backup/restore.go b/pkg/backup/restore.go
@@ -873,6 +873,9 @@ func (b *Backuper) downloadObjectDiskParts(ctx context.Context, backupName strin
 					downloadObjectDiskPartsWorkingGroup.Go(func() error {
 						var srcBucket, srcKey string
 						for _, storageObject := range objMeta.StorageObjects {
+							if storageObject.ObjectSize == 0 {
+								continue
+							}
 							if b.cfg.General.RemoteStorage == "s3" && diskType == "s3" {
 								srcBucket = b.cfg.S3.Bucket
 								srcKey = path.Join(b.cfg.S3.ObjectDiskPath, backupName, diskName, storageObject.ObjectRelativePath)