Make max copy size before multipart a setting.

And override it in S3RepositoryAnalysisRestIT to
exercise multipart copy.

Author: bcully

modules/repository-s3/src/internalClusterTest/java/org/elasticsearch/repositories/s3/S3BlobStoreRepositoryTests.java

@@ -623,7 +623,7 @@ long getLargeBlobThresholdInBytes() {
                                 }
 
                                 @Override
-                                long getLargeCopyThresholdInBytes() {
+                                long getMaxCopySizeBeforeMultipart() {
                                     // on my laptop 10K exercises this better but larger values should be fine for nightlies
                                     return ByteSizeUnit.MB.toBytes(1L);
                                 }

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobContainer.java

@@ -305,8 +305,8 @@ long getLargeBlobThresholdInBytes() {
     }
 
     // package private for testing
-    long getLargeCopyThresholdInBytes() {
-        return MAX_FILE_SIZE.getBytes();
+    long getMaxCopySizeBeforeMultipart() {
+        return blobStore.maxCopySizeBeforeMultipart();
     }
 
     @Override
@@ -358,7 +358,7 @@ public void copyBlob(
         final var s3SourceBlobContainer = (S3BlobContainer) sourceBlobContainer;
 
         try {
-            if (blobSize > getLargeCopyThresholdInBytes()) {
+            if (blobSize > getMaxCopySizeBeforeMultipart()) {
                 executeMultipartCopy(purpose, s3SourceBlobContainer, sourceBlobName, blobName, blobSize);
             } else {
                 // metadata is inherited from source, but not canned ACL or storage class

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3BlobStore.java

@@ -80,6 +80,8 @@ class S3BlobStore implements BlobStore {
 
     private final ByteSizeValue bufferSize;
 
+    private final ByteSizeValue maxCopySizeBeforeMultipart;
+
     private final boolean serverSideEncryption;
 
     private final CannedAccessControlList cannedACL;
@@ -104,6 +106,7 @@ class S3BlobStore implements BlobStore {
         String bucket,
         boolean serverSideEncryption,
         ByteSizeValue bufferSize,
+        ByteSizeValue maxCopySizeBeforeMultipart,
         String cannedACL,
         String storageClass,
         RepositoryMetadata repositoryMetadata,
@@ -117,6 +120,7 @@ class S3BlobStore implements BlobStore {
         this.bucket = bucket;
         this.serverSideEncryption = serverSideEncryption;
         this.bufferSize = bufferSize;
+        this.maxCopySizeBeforeMultipart = maxCopySizeBeforeMultipart;
         this.cannedACL = initCannedACL(cannedACL);
         this.storageClass = initStorageClass(storageClass);
         this.repositoryMetadata = repositoryMetadata;
@@ -329,6 +333,10 @@ public long bufferSizeInBytes() {
         return bufferSize.getBytes();
     }
 
+    public long maxCopySizeBeforeMultipart() {
+        return maxCopySizeBeforeMultipart.getBytes();
+    }
+
     public RepositoryMetadata getRepositoryMetadata() {
         return repositoryMetadata;
     }

modules/repository-s3/src/main/java/org/elasticsearch/repositories/s3/S3Repository.java

@@ -131,6 +131,18 @@ class S3Repository extends MeteredBlobStoreRepository {
         MAX_PART_SIZE_USING_MULTIPART
     );
 
+    /**
+     * Maximum size allowed for copy without multipart.
+     * Objects larger than this will be copied using multipart copy. S3 enforces a minimum multipart size of 5 MiB and a maximum
+     * non-multipart copy size of 5 GiB. The default is to use the maximum allowable size in order to minimize request count.
+     */
+    static final Setting<ByteSizeValue> MAX_COPY_SIZE_BEFORE_MULTIPART = Setting.byteSizeSetting(
+        "max_copy_size_before_multipart",
+        MAX_FILE_SIZE,
+        MIN_PART_SIZE_USING_MULTIPART,
+        MAX_FILE_SIZE
+    );
+
     /**
      * Big files can be broken down into chunks during snapshotting if needed. Defaults to 5tb.
      */
@@ -241,6 +253,8 @@ class S3Repository extends MeteredBlobStoreRepository {
 
     private final ByteSizeValue chunkSize;
 
+    private final ByteSizeValue maxCopySizeBeforeMultipart;
+
     private final boolean serverSideEncryption;
 
     private final String storageClass;
@@ -308,6 +322,8 @@ class S3Repository extends MeteredBlobStoreRepository {
             );
         }
 
+        this.maxCopySizeBeforeMultipart = MAX_COPY_SIZE_BEFORE_MULTIPART.get(metadata.settings());
+
         this.serverSideEncryption = SERVER_SIDE_ENCRYPTION_SETTING.get(metadata.settings());
 
         this.storageClass = STORAGE_CLASS_SETTING.get(metadata.settings());
@@ -325,11 +341,13 @@ class S3Repository extends MeteredBlobStoreRepository {
         coolDown = COOLDOWN_PERIOD.get(metadata.settings());
 
         logger.debug(
-            "using bucket [{}], chunk_size [{}], server_side_encryption [{}], buffer_size [{}], cannedACL [{}], storageClass [{}]",
+            "using bucket [{}], chunk_size [{}], server_side_encryption [{}], buffer_size [{}], "
+                + "max_copy_size_before_multipart [{}], cannedACL [{}], storageClass [{}]",
             bucket,
             chunkSize,
             serverSideEncryption,
             bufferSize,
+            maxCopySizeBeforeMultipart,
             cannedACL,
             storageClass
         );
@@ -454,6 +472,7 @@ protected S3BlobStore createBlobStore() {
             bucket,
             serverSideEncryption,
             bufferSize,
+            maxCopySizeBeforeMultipart,
             cannedACL,
             storageClass,
             metadata,

modules/repository-s3/src/test/java/org/elasticsearch/repositories/s3/S3BlobContainerRetriesTests.java

@@ -214,6 +214,7 @@ protected BlobContainer createBlobContainer(
             "bucket",
             S3Repository.SERVER_SIDE_ENCRYPTION_SETTING.getDefault(Settings.EMPTY),
             bufferSize == null ? S3Repository.BUFFER_SIZE_SETTING.getDefault(Settings.EMPTY) : bufferSize,
+            S3Repository.MAX_COPY_SIZE_BEFORE_MULTIPART.getDefault(Settings.EMPTY),
             S3Repository.CANNED_ACL_SETTING.getDefault(Settings.EMPTY),
             S3Repository.STORAGE_CLASS_SETTING.getDefault(Settings.EMPTY),
             repositoryMetadata,

x-pack/plugin/snapshot-repo-test-kit/qa/s3/src/javaRestTest/java/org/elasticsearch/repositories/blobstore/testkit/analyze/S3RepositoryAnalysisRestIT.java

@@ -61,6 +61,7 @@ protected Settings repositorySettings() {
             .put("base_path", basePath)
             .put("delete_objects_max_size", between(1, 1000))
             .put("buffer_size", ByteSizeValue.ofMb(5)) // so some uploads are multipart ones
+            .put("max_copy_size_before_multipart", ByteSizeValue.ofMb(5))
             .build();
     }
 }