From d79255fb8b5ad7149e50eb33f835cced27f671f5 Mon Sep 17 00:00:00 2001
From: Slach <bloodjazman@gmail.com>
Date: Fri, 8 Dec 2023 12:00:26 +0400
Subject: [PATCH] fix CopyObject to use simple CopyObject call, instead of
 multipart for zero object size, for backup S3 disks

---
 ChangeLog.md      |  4 ++++
 pkg/storage/s3.go | 17 ++++++++++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 20f2b5dc..93756f11 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+# v2.4.12
+BUG FIXES
+- fix CopyObject to use simple CopyObject call, instead of multipart for zero object size, for backup S3 disks
+
 # v2.4.11
 BUG FIXES
 - fix CopyObject multipart upload complete Parts must be ordered by part number, for backup S3 disks
diff --git a/pkg/storage/s3.go b/pkg/storage/s3.go
index 21652291..22e3161b 100644
--- a/pkg/storage/s3.go
+++ b/pkg/storage/s3.go
@@ -452,6 +452,7 @@ func (s *S3) remotePager(ctx context.Context, s3Path string, recursive bool, pro
 }
 
 func (s *S3) CopyObject(ctx context.Context, srcBucket, srcKey, dstKey string) (int64, error) {
+	s.Log.Debugf("S3->CopyObject %s/%s -> %s/%s", srcBucket, srcKey, s.Config.Bucket, dstKey)
 	dstKey = path.Join(s.Config.ObjectDiskPath, dstKey)
 	if strings.Contains(s.Config.Endpoint, "storage.googleapis.com") {
 		params := &s3.CopyObjectInput{
@@ -487,6 +488,21 @@ func (s *S3) CopyObject(ctx context.Context, srcBucket, srcKey, dstKey string) (
 		return 0, err
 	}
 	srcSize := *sourceObjResp.ContentLength
+	// just copy object without multipart
+	if srcSize == 0 {
+		params := &s3.CopyObjectInput{
+			Bucket:       aws.String(s.Config.Bucket),
+			Key:          aws.String(dstKey),
+			CopySource:   aws.String(path.Join(srcBucket, srcKey)),
+			StorageClass: s3types.StorageClass(strings.ToUpper(s.Config.StorageClass)),
+		}
+		s.enrichCopyObjectParams(params)
+		_, err := s.client.CopyObject(ctx, params)
+		if err != nil {
+			return 0, err
+		}
+		return srcSize, nil
+	}
 	// Initiate a multipart upload
 	createMultipartUploadParams := &s3.CreateMultipartUploadInput{
 		Bucket:       aws.String(s.Config.Bucket),
@@ -594,7 +610,6 @@ func (s *S3) CopyObject(ctx context.Context, srcBucket, srcKey, dstKey string) (
 	if err != nil {
 		return 0, fmt.Errorf("complete CopyObject multipart upload: %v", err)
 	}
-	s.Log.Debugf("S3->CopyObject %s/%s -> %s/%s", srcBucket, srcKey, s.Config.Bucket, dstKey)
 	return srcSize, nil
 }