Discard the retry setting changes in Cloud Storage adatper

Author: KodaiD

core/src/main/java/com/scalar/db/storage/objectstorage/cloudstorage/CloudStorageConfig.java

@@ -23,15 +23,12 @@ public class CloudStorageConfig implements ObjectStorageConfig {
   public static final String INITIAL_RETRY_DELAY_IN_SECONDS =
       PREFIX + "initial_retry_delay_in_seconds";
 
-  public static final Integer DEFAULT_INITIAL_RETRY_DELAY_IN_SECONDS = 1;
-
   private static final Logger logger = LoggerFactory.getLogger(CloudStorageConfig.class);
   private final String password;
   private final String bucket;
   private final String metadataNamespace;
   private final String projectId;
   private final Integer parallelUploadBlockSizeInBytes;
-  private final Integer initialRetryDelayInSeconds;
 
   public CloudStorageConfig(DatabaseConfig databaseConfig) {
     String storage = databaseConfig.getStorage();
@@ -56,11 +53,6 @@ public CloudStorageConfig(DatabaseConfig databaseConfig) {
 
     parallelUploadBlockSizeInBytes =
         getInt(databaseConfig.getProperties(), PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES, null);
-    initialRetryDelayInSeconds =
-        getInt(
-            databaseConfig.getProperties(),
-            INITIAL_RETRY_DELAY_IN_SECONDS,
-            DEFAULT_INITIAL_RETRY_DELAY_IN_SECONDS);
   }
 
   @Override
@@ -105,8 +97,4 @@ public Credentials getCredentials() {
   public Optional<Integer> getParallelUploadBlockSizeInBytes() {
     return Optional.ofNullable(parallelUploadBlockSizeInBytes);
   }
-
-  public Integer getInitialRetryDelayInSeconds() {
-    return initialRetryDelayInSeconds;
-  }
 }

core/src/main/java/com/scalar/db/storage/objectstorage/cloudstorage/CloudStorageWrapper.java

@@ -1,6 +1,5 @@
 package com.scalar.db.storage.objectstorage.cloudstorage;
 
-import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.WriteChannel;
 import com.google.cloud.storage.Blob;
 import com.google.cloud.storage.BlobId;
@@ -26,7 +25,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.StreamSupport;
 import javax.annotation.concurrent.ThreadSafe;
-import org.threeten.bp.Duration;
 
 @ThreadSafe
 public class CloudStorageWrapper implements ObjectStorageWrapper {
@@ -42,11 +40,6 @@ public CloudStorageWrapper(CloudStorageConfig config) {
         StorageOptions.newBuilder()
             .setProjectId(config.getProjectId())
             .setCredentials(config.getCredentials())
-            .setRetrySettings(
-                RetrySettings.newBuilder()
-                    .setInitialRetryDelay(
-                        Duration.ofSeconds(config.getInitialRetryDelayInSeconds()))
-                    .build())
             .build()
             .getService();
     bucket = config.getBucket();

core/src/test/java/com/scalar/db/storage/objectstorage/cloudstorage/CloudStorageConfigTest.java

@@ -15,7 +15,6 @@ public class CloudStorageConfigTest {
   private static final String CloudStorage_STORAGE = "cloud-storage";
   private static final String ANY_TABLE_METADATA_NAMESPACE = "any_namespace";
   private static final String ANY_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES = "5242880"; // 5MB
-  private static final String ANY_INITIAL_RETRY_DELAY_IN_SECONDS = "2";
 
   @Test
   public void constructor_AllPropertiesGiven_ShouldLoadProperly() {
@@ -29,8 +28,6 @@ public void constructor_AllPropertiesGiven_ShouldLoadProperly() {
     props.setProperty(
         CloudStorageConfig.PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES,
         ANY_PARALLEL_UPLOAD_BLOCK_SIZE_IN_BYTES);
-    props.setProperty(
-        CloudStorageConfig.INITIAL_RETRY_DELAY_IN_SECONDS, ANY_INITIAL_RETRY_DELAY_IN_SECONDS);
 
     // Act
     CloudStorageConfig config = new CloudStorageConfig(new DatabaseConfig(props));
@@ -42,7 +39,6 @@ public void constructor_AllPropertiesGiven_ShouldLoadProperly() {
     assertThat(config.getMetadataNamespace()).isEqualTo(ANY_TABLE_METADATA_NAMESPACE);
     assertThat(config.getParallelUploadBlockSizeInBytes()).isNotEmpty();
     assertThat(config.getParallelUploadBlockSizeInBytes().get()).isEqualTo(5242880);
-    assertThat(config.getInitialRetryDelayInSeconds()).isEqualTo(2);
   }
 
   @Test
@@ -64,8 +60,6 @@ public void constructor_PropertiesWithoutNonMandatoryOptionsGiven_ShouldLoadProp
     assertThat(config.getMetadataNamespace())
         .isEqualTo(DatabaseConfig.DEFAULT_SYSTEM_NAMESPACE_NAME);
     assertThat(config.getParallelUploadBlockSizeInBytes()).isEmpty();
-    assertThat(config.getInitialRetryDelayInSeconds())
-        .isEqualTo(CloudStorageConfig.DEFAULT_INITIAL_RETRY_DELAY_IN_SECONDS);
   }
 
   @Test