From a067cf6c02bdf897a89fa405f24f7ef342db4ae2 Mon Sep 17 00:00:00 2001
From: Tim Brooks <tim@timbrooks.org>
Date: Wed, 31 May 2023 14:21:41 -0600
Subject: [PATCH] Disable GCS gzip compression on small uploads

By default the GCS client compresses single request uploads with gzip.
This is expensive and rarely makes sense in the environments where the
uploads are occurring. Additionally, these files are not compressed in
transit on other Cloud providers and not for large uploads on GCS.

Disable by default and allow system property revert option.
---
 .../gcs/GoogleCloudStorageBlobStore.java      | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java b/modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java
index 7d6ac118ceb01..0fd89ceb5e517 100644
--- a/modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java
+++ b/modules/repository-gcs/src/main/java/org/elasticsearch/repositories/gcs/GoogleCloudStorageBlobStore.java
@@ -75,6 +75,7 @@ class GoogleCloudStorageBlobStore implements BlobStore {
     // called "resumable upload")
     // https://cloud.google.com/storage/docs/json_api/v1/how-tos/resumable-upload
     public static final int LARGE_BLOB_THRESHOLD_BYTE_SIZE;
+    public static final boolean ENABLE_DEFAULT_GCP_COMPRESSION;
     public static final int MAX_DELETES_PER_BATCH = 1000;
 
     static {
@@ -94,6 +95,13 @@ class GoogleCloudStorageBlobStore implements BlobStore {
             }
             LARGE_BLOB_THRESHOLD_BYTE_SIZE = largeBlobThresholdByteSize;
         }
+
+        final String enabledCompressProperty = System.getProperty("es.repository_gcs.enable_default_gcs_compression");
+        if (largeBlobThresholdByteSizeProperty == null) {
+            ENABLE_DEFAULT_GCP_COMPRESSION = false;
+        } else {
+            ENABLE_DEFAULT_GCP_COMPRESSION = Boolean.parseBoolean(enabledCompressProperty);
+        }
     }
 
     private final String bucketName;
@@ -455,8 +463,7 @@ private void writeBlobResumable(BlobInfo blobInfo, InputStream inputStream, long
 
     /**
      * Uploads a blob using the "multipart upload" method (a single
-     * 'multipart/related' request containing both data and metadata. The request is
-     * gziped), see:
+     * 'multipart/related' request containing both data and metadata. see:
      * https://cloud.google.com/storage/docs/json_api/v1/how-tos/multipart-upload
      * @param blobInfo the info for the blob to be uploaded
      * @param buffer the byte array containing the data
@@ -468,10 +475,21 @@ private void writeBlobMultipart(BlobInfo blobInfo, byte[] buffer, int offset, in
         throws IOException {
         assert blobSize <= getLargeBlobThresholdInBytes() : "large blob uploads should use the resumable upload method";
         try {
-            final Storage.BlobTargetOption[] targetOptions = failIfAlreadyExists
-                ? new Storage.BlobTargetOption[] { Storage.BlobTargetOption.doesNotExist() }
-                : new Storage.BlobTargetOption[0];
-            SocketAccess.doPrivilegedVoidIOException(() -> client().create(blobInfo, buffer, offset, blobSize, targetOptions));
+            // By default GCS will gzip compress uploads. We disable this unless the system property to re-enable this has been configured
+            final Storage.BlobTargetOption[] targetOptions;
+            if (ENABLE_DEFAULT_GCP_COMPRESSION) {
+                targetOptions = failIfAlreadyExists
+                    ? new Storage.BlobTargetOption[] {
+                        Storage.BlobTargetOption.doesNotExist(),
+                        Storage.BlobTargetOption.disableGzipContent() }
+                    : new Storage.BlobTargetOption[] { Storage.BlobTargetOption.disableGzipContent() };
+                SocketAccess.doPrivilegedVoidIOException(() -> client().create(blobInfo, buffer, offset, blobSize, targetOptions));
+            } else {
+                targetOptions = failIfAlreadyExists
+                    ? new Storage.BlobTargetOption[] { Storage.BlobTargetOption.doesNotExist() }
+                    : new Storage.BlobTargetOption[0];
+                SocketAccess.doPrivilegedVoidIOException(() -> client().create(blobInfo, buffer, offset, blobSize, targetOptions));
+            }
             // We don't track this operation on the http layer as
             // we do with the GET/LIST operations since this operations
             // can trigger multiple underlying http requests but only one