chore: Enable exponential backoff for retries in tests

Author: lqiu96

google-cloud-bigquery/src/main/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelper.java

@@ -45,7 +45,7 @@ public class RemoteBigQueryHelper {
   private static final String MODEL_NAME_PREFIX = "model_";
   private static final String ROUTINE_NAME_PREFIX = "routine_";
   private final BigQueryOptions options;
-  private static final int connectTimeout = 60000;
+  private static final int CONNECT_TIMEOUT_IN_MS = 60000;
 
   private RemoteBigQueryHelper(BigQueryOptions options) {
     this.options = options;
@@ -96,8 +96,8 @@ public static RemoteBigQueryHelper create(String projectId, InputStream keyStrea
       HttpTransportOptions transportOptions = BigQueryOptions.getDefaultHttpTransportOptions();
       transportOptions =
           transportOptions.toBuilder()
-              .setConnectTimeout(connectTimeout)
-              .setReadTimeout(connectTimeout)
+              .setConnectTimeout(CONNECT_TIMEOUT_IN_MS)
+              .setReadTimeout(CONNECT_TIMEOUT_IN_MS)
               .build();
       BigQueryOptions bigqueryOptions =
           BigQueryOptions.newBuilder()
@@ -133,8 +133,8 @@ public static RemoteBigQueryHelper create(BigQueryOptions.Builder bigqueryOption
     HttpTransportOptions transportOptions = BigQueryOptions.getDefaultHttpTransportOptions();
     transportOptions =
         transportOptions.toBuilder()
-            .setConnectTimeout(connectTimeout)
-            .setReadTimeout(connectTimeout)
+            .setConnectTimeout(CONNECT_TIMEOUT_IN_MS)
+            .setReadTimeout(CONNECT_TIMEOUT_IN_MS)
             .build();
     BigQueryOptions.Builder builder =
         bigqueryOptionsBuilder
@@ -143,21 +143,25 @@ public static RemoteBigQueryHelper create(BigQueryOptions.Builder bigqueryOption
     return new RemoteBigQueryHelper(builder.build());
   }
 
+  // Opt to keep these settings a small as possible to minimize the total test time.
+  // These values can be adjusted per test case, but these serve as default values.
   private static RetrySettings retrySettings() {
-    double retryDelayMultiplier = 1.0;
+    double multiplier = 1.5;
     int maxAttempts = 10;
-    long initialRetryDelay = 250L;
-    long maxRetryDelay = 30000L;
-    long totalTimeOut = 120000L;
+    long initialRetryDelayMs = 100L; // 0.1s initial retry delay
+    long maxRetryDelayMs = 1000L; // 1s max retry delay between retry
+    long initialRpcTimeoutMs = 1000L; // 1s initial rpc duration
+    long maxRpcTimeoutMs = 2000L; // 2s max rpc duration
+    long totalTimeOut = 3000L; // 3s total timeout
     return RetrySettings.newBuilder()
         .setMaxAttempts(maxAttempts)
-        .setMaxRetryDelayDuration(Duration.ofMillis(maxRetryDelay))
         .setTotalTimeoutDuration(Duration.ofMillis(totalTimeOut))
-        .setInitialRetryDelayDuration(Duration.ofMillis(initialRetryDelay))
-        .setRetryDelayMultiplier(retryDelayMultiplier)
-        .setInitialRpcTimeoutDuration(Duration.ofMillis(totalTimeOut))
-        .setRpcTimeoutMultiplier(retryDelayMultiplier)
-        .setMaxRpcTimeoutDuration(Duration.ofMillis(totalTimeOut))
+        .setInitialRetryDelayDuration(Duration.ofMillis(initialRetryDelayMs))
+        .setMaxRetryDelayDuration(Duration.ofMillis(maxRetryDelayMs))
+        .setRetryDelayMultiplier(multiplier)
+        .setInitialRpcTimeoutDuration(Duration.ofMillis(initialRpcTimeoutMs))
+        .setMaxRpcTimeoutDuration(Duration.ofMillis(maxRpcTimeoutMs))
+        .setRpcTimeoutMultiplier(multiplier)
         .build();
   }
 

google-cloud-bigquery/src/test/java/com/google/cloud/bigquery/testing/RemoteBigQueryHelperTest.java

@@ -26,14 +26,13 @@
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
 import java.time.Duration;
-import java.util.concurrent.ExecutionException;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 @ExtendWith(MockitoExtension.class)
-public class RemoteBigQueryHelperTest {
+class RemoteBigQueryHelperTest {
 
   private static final String DATASET_NAME = "dataset-name";
   private static final String PROJECT_ID = "project-id";
@@ -67,7 +66,7 @@ public class RemoteBigQueryHelperTest {
   private static final InputStream JSON_KEY_STREAM = new ByteArrayInputStream(JSON_KEY.getBytes());
 
   @Test
-  public void testForceDelete() throws InterruptedException, ExecutionException {
+  void testForceDelete() {
     BigQuery bigqueryMock = Mockito.mock(BigQuery.class);
     Mockito.when(bigqueryMock.delete(DATASET_NAME, DatasetDeleteOption.deleteContents()))
         .thenReturn(true);
@@ -76,15 +75,15 @@ public void testForceDelete() throws InterruptedException, ExecutionException {
   }
 
   @Test
-  public void testCreateFromStream() {
+  void testCreateFromStream() {
     RemoteBigQueryHelper helper = RemoteBigQueryHelper.create(PROJECT_ID, JSON_KEY_STREAM);
     BigQueryOptions options = helper.getOptions();
     assertEquals(PROJECT_ID, options.getProjectId());
     assertEquals(60000, ((HttpTransportOptions) options.getTransportOptions()).getConnectTimeout());
     assertEquals(60000, ((HttpTransportOptions) options.getTransportOptions()).getReadTimeout());
     assertEquals(10, options.getRetrySettings().getMaxAttempts());
-    assertEquals(Duration.ofMillis(30000), options.getRetrySettings().getMaxRetryDelayDuration());
-    assertEquals(Duration.ofMillis(120000), options.getRetrySettings().getTotalTimeoutDuration());
-    assertEquals(Duration.ofMillis(250), options.getRetrySettings().getInitialRetryDelayDuration());
+    assertEquals(Duration.ofMillis(1000), options.getRetrySettings().getMaxRetryDelayDuration());
+    assertEquals(Duration.ofMillis(3000), options.getRetrySettings().getTotalTimeoutDuration());
+    assertEquals(Duration.ofMillis(100), options.getRetrySettings().getInitialRetryDelayDuration());
   }
 }