Add wait to integration test cases

KodaiD · KodaiD · commit eb2790e6fbb2 · 2025-11-21T11:49:09.000+09:00
diff --git a/.github/workflows/object-storage-adapter-check.yaml b/.github/workflows/object-storage-adapter-check.yaml
@@ -144,14 +144,6 @@ jobs:
       fail-fast: false
       matrix:
         test_group:
-          - label: consensus_commit_default
-            tests_filter: '--tests "**.ConsensusCommit**"'
-            bucket_suffix: consensus-commit
-            group_commit_enabled: false
-          - label: consensus_commit_with_group_commit
-            tests_filter: '--tests "**.ConsensusCommit**"'
-            bucket_suffix: consensus-commit-gc
-            group_commit_enabled: true
           - label: storage_scan
             tests_filter: '--tests "**.ObjectStorageSingle**" --tests "**.ObjectStorageMultiple**"'
             bucket_suffix: storage-scan
@@ -172,10 +164,6 @@ jobs:
             tests_filter: '--tests "**.ObjectStorage**" --tests "*!ObjectStorageSingle" --tests "*!ObjectStorageMultiple" --tests "*!ObjectStorageWrapper" --tests "*!ObjectStorageAdmin" --tests "*!ObjectStorageConditionalMutation"'
             bucket_suffix: storage
             group_commit_enabled: false
-          - label: two_phase_consensus_commit
-            tests_filter: '--tests "**.TwoPhaseConsensusCommit**"'
-            bucket_suffix: 2pcc
-            group_commit_enabled: false
           - label: single_crud_operation_transaction
             tests_filter: '--tests "**.SingleCrudOperationTransaction**"'
             bucket_suffix: single-crud
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageAdminRepairIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageAdminRepairIntegrationTest.java
@@ -1,10 +1,12 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageAdminRepairIntegrationTestBase;
 import com.scalar.db.api.Scan;
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.io.DataType;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Disabled;
 
 public class ObjectStorageAdminRepairIntegrationTest
@@ -35,6 +37,13 @@ protected TableMetadata getTableMetadata() {
         .build();
   }
 
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageCaseSensitivityIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageCaseSensitivityIntegrationTest.java
@@ -1,10 +1,12 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageCaseSensitivityIntegrationTestBase;
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.io.DataType;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Disabled;
 
 public class ObjectStorageCaseSensitivityIntegrationTest
@@ -24,6 +26,13 @@ protected TableMetadata getTableMetadata() {
         .build();
   }
 
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageColumnValueIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageColumnValueIntegrationTest.java
@@ -1,12 +1,22 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageColumnValueIntegrationTestBase;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 public class ObjectStorageColumnValueIntegrationTest
     extends DistributedStorageColumnValueIntegrationTestBase {
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
+
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
 }
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageConditionalMutationIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageConditionalMutationIntegrationTest.java
@@ -1,7 +1,9 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageConditionalMutationIntegrationTestBase;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 public class ObjectStorageConditionalMutationIntegrationTest
     extends DistributedStorageConditionalMutationIntegrationTestBase {
@@ -15,4 +17,11 @@ protected int getThreadNum() {
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
+
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
 }
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageIntegrationTest.java
@@ -1,10 +1,12 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageIntegrationTestBase;
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.io.DataType;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Disabled;
 
 public class ObjectStorageIntegrationTest extends DistributedStorageIntegrationTestBase {
@@ -23,6 +25,13 @@ protected TableMetadata getTableMetadata() {
         .build();
   }
 
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageJapaneseIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageJapaneseIntegrationTest.java
@@ -1,7 +1,9 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageJapaneseIntegrationTestBase;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 public class ObjectStorageJapaneseIntegrationTest
     extends DistributedStorageJapaneseIntegrationTestBase {
@@ -10,4 +12,11 @@ public class ObjectStorageJapaneseIntegrationTest
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
   }
+
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
 }
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMutationAtomicityUnitIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageMutationAtomicityUnitIntegrationTest.java
@@ -1,8 +1,10 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageMutationAtomicityUnitIntegrationTestBase;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 public class ObjectStorageMutationAtomicityUnitIntegrationTest
     extends DistributedStorageMutationAtomicityUnitIntegrationTestBase {
@@ -16,4 +18,11 @@ protected Properties getProperties(String testName) {
   protected Map<String, String> getCreationOptions() {
     return ObjectStorageEnv.getCreationOptions();
   }
+
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
 }
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWithReservedKeywordIntegrationTest.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/ObjectStorageWithReservedKeywordIntegrationTest.java
@@ -1,10 +1,12 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.DistributedStorageWithReservedKeywordIntegrationTestBase;
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.io.DataType;
 import java.util.Map;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 import org.junit.jupiter.api.Disabled;
 
 public class ObjectStorageWithReservedKeywordIntegrationTest
@@ -24,6 +26,13 @@ protected TableMetadata getTableMetadata() {
         .build();
   }
 
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
   @Override
   protected Properties getProperties(String testName) {
     return ObjectStorageEnv.getProperties(testName);
diff --git a/core/src/integration-test/java/com/scalar/db/storage/objectstorage/SingleCrudOperationTransactionIntegrationTestWithObjectStorage.java b/core/src/integration-test/java/com/scalar/db/storage/objectstorage/SingleCrudOperationTransactionIntegrationTestWithObjectStorage.java
@@ -1,13 +1,22 @@
 package com.scalar.db.storage.objectstorage;
 
+import com.google.common.util.concurrent.Uninterruptibles;
 import com.scalar.db.api.TableMetadata;
 import com.scalar.db.io.DataType;
 import com.scalar.db.transaction.singlecrudoperation.SingleCrudOperationTransactionIntegrationTestBase;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
 
 public class SingleCrudOperationTransactionIntegrationTestWithObjectStorage
     extends SingleCrudOperationTransactionIntegrationTestBase {
 
+  @Override
+  protected void waitToAvoidRateLimiting() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
   @Override
   protected TableMetadata getTableMetadata() {
     return TableMetadata.newBuilder()
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminRepairIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageAdminRepairIntegrationTestBase.java
@@ -132,14 +132,20 @@ private void dropTable() throws ExecutionException {
     admin.dropNamespace(getNamespace(), true);
   }
 
+  protected void waitToAvoidRateLimiting() {
+    // Default do nothing
+  }
+
   @BeforeEach
   protected void setUp() throws Exception {
     createTable();
+    waitToAvoidRateLimiting();
   }
 
   @AfterEach
   protected void afterEach() throws Exception {
     dropTable();
+    waitToAvoidRateLimiting();
   }
 
   protected void waitForDifferentSessionDdl() {
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageColumnValueIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageColumnValueIntegrationTestBase.java
@@ -119,9 +119,14 @@ protected Map<String, String> getCreationOptions() {
     return Collections.emptyMap();
   }
 
+  protected void waitToAvoidRateLimiting() {
+    // Default do nothing
+  }
+
   @BeforeEach
   public void setUp() throws Exception {
     admin.truncateTable(namespace, TABLE);
+    waitToAvoidRateLimiting();
   }
 
   @AfterAll
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageConditionalMutationIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageConditionalMutationIntegrationTestBase.java
@@ -141,9 +141,14 @@ protected Map<String, String> getCreationOptions() {
     return Collections.emptyMap();
   }
 
+  protected void waitToAvoidRateLimiting() {
+    // Default do nothing
+  }
+
   @BeforeEach
   public void setUp() throws Exception {
     admin.truncateTable(namespace, TABLE);
+    waitToAvoidRateLimiting();
   }
 
   @AfterAll
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageIntegrationTestBase.java
@@ -144,9 +144,14 @@ protected Map<String, String> getCreationOptions() {
     return Collections.emptyMap();
   }
 
+  protected void waitToAvoidRateLimiting() {
+    // Default do nothing
+  }
+
   @BeforeEach
   public void setUp() throws Exception {
     truncateTable();
+    waitToAvoidRateLimiting();
   }
 
   private void truncateTable() throws ExecutionException {
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageJapaneseIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageJapaneseIntegrationTestBase.java
@@ -72,9 +72,14 @@ protected Map<String, String> getCreationOptions() {
     return Collections.emptyMap();
   }
 
+  protected void waitToAvoidRateLimiting() {
+    // Default do nothing
+  }
+
   @BeforeEach
   public void setUp() throws Exception {
     truncateTable();
+    waitToAvoidRateLimiting();
   }
 
   private void truncateTable() throws ExecutionException {
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedStorageMutationAtomicityUnitIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedStorageMutationAtomicityUnitIntegrationTestBase.java
@@ -94,9 +94,14 @@ protected Map<String, String> getCreationOptions() {
     return Collections.emptyMap();
   }
 
+  protected void waitToAvoidRateLimiting() {
+    // Default do nothing
+  }
+
   @BeforeEach
   public void setUp() throws Exception {
     truncateTable();
+    waitToAvoidRateLimiting();
   }
 
   protected void truncateTable() throws ExecutionException {
diff --git a/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/api/DistributedTransactionIntegrationTestBase.java
@@ -146,10 +146,15 @@ protected Map<String, String> getCreationOptions() {
     return Collections.emptyMap();
   }
 
+  protected void waitToAvoidRateLimiting() {
+    // Default do nothing
+  }
+
   @BeforeEach
   public void setUp() throws Exception {
     admin.truncateTable(namespace, TABLE);
     admin.truncateCoordinatorTables();
+    waitToAvoidRateLimiting();
   }
 
   @AfterAll
diff --git a/integration-test/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionIntegrationTestBase.java b/integration-test/src/main/java/com/scalar/db/transaction/singlecrudoperation/SingleCrudOperationTransactionIntegrationTestBase.java
@@ -46,6 +46,7 @@ protected void populateRecords() throws TransactionException {
                 .clusteringKey(clusteringKey);
         prepareNonKeyColumns(i, j).forEach(insert::value);
         manager.insert(insert.build());
+        waitToAvoidRateLimiting();
       }
     }
   }
