Add waits

Author: KodaiD

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitIntegrationTestWithObjectStorage.java

@@ -1,14 +1,35 @@
 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.consensuscommit.ConsensusCommitIntegrationTestBase;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 
 public class ConsensusCommitIntegrationTestWithObjectStorage
     extends ConsensusCommitIntegrationTestBase {
 
+  @Override
+  @BeforeEach
+  public void setUp() throws Exception {
+    admin.truncateTable(namespace, TABLE);
+    admin.truncateCoordinatorTables();
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
+  @AfterEach
+  void tearDown() {
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
   @Override
   protected TableMetadata getTableMetadata() {
     return TableMetadata.newBuilder()

core/src/integration-test/java/com/scalar/db/storage/objectstorage/ConsensusCommitSpecificIntegrationTestWithObjectStorage.java

@@ -1,15 +1,40 @@
 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.consensuscommit.ConsensusCommitSpecificIntegrationTestBase;
 import com.scalar.db.transaction.consensuscommit.Isolation;
 import java.util.Properties;
+import java.util.concurrent.TimeUnit;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 
 public class ConsensusCommitSpecificIntegrationTestWithObjectStorage
     extends ConsensusCommitSpecificIntegrationTestBase {
 
+  @Override
+  @BeforeEach
+  protected void setUp() throws Exception {
+    truncateTables();
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
+  @Override
+  @AfterEach
+  public void tearDown() {
+    recoveryExecutor.close();
+    if (groupCommitter != null) {
+      groupCommitter.close();
+    }
+    if (ObjectStorageEnv.isCloudStorage()) {
+      Uninterruptibles.sleepUninterruptibly(1, TimeUnit.SECONDS);
+    }
+  }
+
   @Override
   protected TableMetadata getTableMetadata() {
     return TableMetadata.newBuilder()

integration-test/src/main/java/com/scalar/db/transaction/consensuscommit/ConsensusCommitSpecificIntegrationTestBase.java

@@ -112,9 +112,9 @@ public abstract class ConsensusCommitSpecificIntegrationTestBase {
   private DistributedStorage storage;
   private Coordinator coordinator;
   private RecoveryHandler recovery;
-  private RecoveryExecutor recoveryExecutor;
+  protected RecoveryExecutor recoveryExecutor;
   private CommitHandler commit;
-  @Nullable private CoordinatorGroupCommitter groupCommitter;
+  @Nullable protected CoordinatorGroupCommitter groupCommitter;
 
   @BeforeAll
   void beforeAll() throws Exception {
@@ -174,7 +174,7 @@ protected Map<String, String> getCreationOptions() {
   }
 
   @BeforeEach
-  void setUp() throws Exception {
+  protected void setUp() throws Exception {
     truncateTables();
   }
 
@@ -186,7 +186,7 @@ public void tearDown() {
     }
   }
 
-  private void truncateTables() throws ExecutionException {
+  protected void truncateTables() throws ExecutionException {
     consensusCommitAdmin.truncateTable(namespace1, TABLE_1);
     consensusCommitAdmin.truncateTable(namespace2, TABLE_2);
     consensusCommitAdmin.truncateCoordinatorTables();