more test fixes to handle deadline exceeded etc

Author: alecgrieser

fdb-extensions/src/test/java/com/apple/foundationdb/async/RangeSetTest.java

@@ -65,7 +65,7 @@ public class RangeSetTest {
     @RegisterExtension
     static final TestDatabaseExtension dbExtension = new TestDatabaseExtension();
     @RegisterExtension
-    TestSubspaceExtension rsSubspaceExtension = new TestSubspaceExtension(dbExtension);
+    final TestSubspaceExtension rsSubspaceExtension = new TestSubspaceExtension(dbExtension);
     private Database db;
     private Subspace rsSubspace;
     private RangeSet rs;

fdb-extensions/src/test/java/com/apple/test/LimitConcurrencyExtension.java

@@ -21,16 +21,20 @@
 package com.apple.test;
 
 import com.google.auto.service.AutoService;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.extension.AfterEachCallback;
 import org.junit.jupiter.api.extension.BeforeEachCallback;
 import org.junit.jupiter.api.extension.Extension;
 import org.junit.jupiter.api.extension.ExtensionContext;
 
+import javax.annotation.Nonnull;
 import java.util.concurrent.Semaphore;
 
 @AutoService(Extension.class)
+@Order(0)
 public class LimitConcurrencyExtension implements BeforeEachCallback, AfterEachCallback {
-    static Semaphore testConcurrency = new Semaphore(Integer.parseInt(System.getProperty("tests.concurrencyLimit", "10")));
+    @Nonnull
+    static Semaphore testConcurrency = new Semaphore(Integer.parseInt(System.getProperty("com.apple.foundationdb.test.concurrencyLimit", "50")));
 
     @Override
     public void beforeEach(final ExtensionContext context) throws InterruptedException {

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/cursors/ConcatCursorTest.java

@@ -40,6 +40,7 @@
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -60,8 +61,10 @@
 public class ConcatCursorTest {
 
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
     FDBDatabase fdb;
     FDBRecordContext context;

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/common/MappedPoolTest.java

@@ -21,6 +21,8 @@
 package com.apple.foundationdb.record.provider.common;
 
 import org.junit.jupiter.api.Test;
+
+import javax.annotation.Nonnull;
 import javax.crypto.Cipher;
 import java.security.GeneralSecurityException;
 
@@ -40,37 +42,43 @@
 public class MappedPoolTest {
 
     public static String CIPHER = "DES/ECB/PKCS5Padding";
-    public static MappedPool<String, Cipher, GeneralSecurityException> MAPPED_POOL = new MappedPool<>(Cipher::getInstance);
+
+    @Nonnull
+    private MappedPool<String, Cipher, GeneralSecurityException> getPool() {
+        return new MappedPool<>(Cipher::getInstance);
+    }
 
     @Test
     public void testCipherPool() throws Exception {
+        final var mappedPool = getPool();
         Cipher lastCipher = null;
         for (int i = 0; i < 100; i++) {
-            Cipher cipher = MAPPED_POOL.poll(CIPHER);
+            Cipher cipher = mappedPool.poll(CIPHER);
             if (lastCipher != null) {
                 assertSame(cipher, lastCipher);
                 lastCipher = cipher;
             }
             assertNotNull(cipher);
-            assertTrue(MAPPED_POOL.offer(CIPHER, cipher));
+            assertTrue(mappedPool.offer(CIPHER, cipher));
         }
-        assertEquals(1, MAPPED_POOL.getPoolSize(CIPHER));
-        assertThat(MAPPED_POOL.getKeys(), hasItem(CIPHER));
+        assertEquals(1, mappedPool.getPoolSize(CIPHER));
+        assertThat(mappedPool.getKeys(), hasItem(CIPHER));
     }
 
     @Test
     public void testMaxPoolSize() throws Exception {
+        final var mappedPool = getPool();
         Cipher[] ciphers = new Cipher[1000];
         for (int i = 0; i < 1000; i++) {
-            ciphers[i] = MAPPED_POOL.poll(CIPHER);
+            ciphers[i] = mappedPool.poll(CIPHER);
         }
         for (int i = 0; i < MappedPool.DEFAULT_POOL_SIZE; i++) {
-            assertTrue(MAPPED_POOL.offer(CIPHER, ciphers[i]));
+            assertTrue(mappedPool.offer(CIPHER, ciphers[i]));
         }
         for (int i = MappedPool.DEFAULT_POOL_SIZE; i < 1000; i++) {
-            assertFalse(MAPPED_POOL.offer(CIPHER, ciphers[i]));
+            assertFalse(mappedPool.offer(CIPHER, ciphers[i]));
         }
-        assertEquals(64, MAPPED_POOL.getPoolSize(CIPHER));
+        assertEquals(64, mappedPool.getPoolSize(CIPHER));
     }
 
 }

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/BlockingInAsyncDetectionTest.java

@@ -28,6 +28,7 @@
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.TimeUnit;
@@ -36,6 +37,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@Isolated
 @Tag(Tags.RequiresFDB)
 class BlockingInAsyncDetectionTest {
     @RegisterExtension

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBDatabaseRunnerTest.java

@@ -38,6 +38,7 @@
 import com.google.protobuf.Message;
 import org.apache.logging.log4j.ThreadContext;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -70,8 +71,10 @@
 @Tag(Tags.RequiresFDB)
 public class FDBDatabaseRunnerTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
 
     FDBDatabase database;

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBDatabaseTest.java

@@ -40,12 +40,15 @@
 import com.apple.test.BooleanSource;
 import com.apple.test.Tags;
 import com.google.protobuf.Message;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.junit.jupiter.api.function.Executable;
 import org.junit.jupiter.api.parallel.Execution;
 import org.junit.jupiter.api.parallel.ExecutionMode;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 import org.slf4j.Logger;
@@ -83,8 +86,10 @@ class FDBDatabaseTest {
     @Nonnull
     private static final Logger LOGGER = LoggerFactory.getLogger(FDBDatabaseTest.class);
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
 
     @Test
@@ -216,6 +221,7 @@ void cachedReadVersionWithRetryLoops(boolean async) throws InterruptedException,
 
     @ParameterizedTest(name = "testJoinNowOnCompletedFuture (behavior = {0})")
     @EnumSource(BlockingInAsyncDetection.class)
+    @ResourceLock(Resources.GLOBAL)
     void testJoinNowOnCompletedFuture(BlockingInAsyncDetection behavior) {
         FDBDatabaseFactory factory = dbExtension.getDatabaseFactory();
         factory.setBlockingInAsyncDetection(behavior);
@@ -231,6 +237,7 @@ void testJoinNowOnCompletedFuture(BlockingInAsyncDetection behavior) {
 
     @ParameterizedTest(name = "testJoinNowOnNonCompletedFuture (behavior = {0})")
     @EnumSource(BlockingInAsyncDetection.class)
+    @ResourceLock(Resources.GLOBAL)
     void testJoinNowOnNonCompletedFuture(BlockingInAsyncDetection behavior) {
         FDBDatabaseFactory factory = dbExtension.getDatabaseFactory();
         factory.setBlockingInAsyncDetection(behavior);

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBMetaDataStoreTest.java

@@ -66,6 +66,7 @@
 import com.google.protobuf.Descriptors;
 import com.google.protobuf.ExtensionRegistry;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -103,8 +104,10 @@
 @Tag(Tags.RequiresFDB)
 public class FDBMetaDataStoreTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
 
     FDBDatabase fdb;

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBRecordContextTest.java

@@ -43,9 +43,12 @@
 import com.google.common.base.Utf8;
 import com.google.common.collect.ImmutableList;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
+import org.junit.jupiter.api.parallel.ResourceLock;
+import org.junit.jupiter.api.parallel.Resources;
 import org.junit.jupiter.params.ParameterizedTest;
 
 import javax.annotation.Nonnull;
@@ -82,8 +85,10 @@
 @Tag(Tags.RequiresFDB)
 public class FDBRecordContextTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
 
     // A list of transaction IDs where the left item is the original ID and the right item is the expected
@@ -333,6 +338,7 @@ public void getReadVersionWithWeakReadSemantics() {
         }
     }
 
+    @ResourceLock(Resources.GLOBAL)
     @Test
     public void getReadVersionAtBatch() {
         final FDBStoreTimer timer = new FDBStoreTimer();

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBRecordStoreConcurrentTestBase.java

@@ -39,6 +39,7 @@
 import com.apple.test.Tags;
 import com.google.common.collect.ImmutableMap;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import org.slf4j.Logger;
@@ -57,8 +58,10 @@
 @Tag(Tags.RequiresFDB)
 public class FDBRecordStoreConcurrentTestBase {
     @RegisterExtension
+    @Order(0)
     protected final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     protected final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
 
     private static final Logger LOGGER = LoggerFactory.getLogger(FDBRecordStoreConcurrentTestBase.class);

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBRecordStoreIndexTest.java

@@ -2250,7 +2250,7 @@ public IndexState needRebuildIndex(Index index, long recordCount, boolean indexO
             recordStore.clearAndMarkIndexWriteOnly("index-1").join();
             context.commit();
         }
-        try (OnlineIndexer onlineIndexBuilder = OnlineIndexer.forRecordStoreAndIndex(recordStore, "index-1")) {
+        try (OnlineIndexer onlineIndexBuilder = newIndexerBuilder().setIndex("index-1").build()) {
             onlineIndexBuilder.buildIndex();
         }
         try (FDBRecordContext context = openContext()) {

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBReverseDirectoryCacheTest.java

@@ -40,6 +40,7 @@
 import com.google.common.collect.BiMap;
 import com.google.common.collect.ImmutableBiMap;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -80,8 +81,10 @@
 @Tag(Tags.RequiresFDB)
 public class FDBReverseDirectoryCacheTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
 
     private static final Logger logger = LoggerFactory.getLogger(FDBReverseDirectoryCacheTest.class);

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBStoreTimerTest.java

@@ -43,6 +43,7 @@
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -76,8 +77,10 @@
 @Execution(ExecutionMode.CONCURRENT)
 public class FDBStoreTimerTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
     FDBDatabase fdb;
     KeySpacePath path;

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/FDBTypedRecordStoreTest.java

@@ -33,6 +33,7 @@
 import com.apple.foundationdb.tuple.Tuple;
 import com.apple.test.Tags;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -47,8 +48,10 @@
 @Tag(Tags.RequiresFDB)
 public class FDBTypedRecordStoreTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
     FDBDatabase fdb;
     KeySpacePath path;

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/KeyValueCursorTest.java

@@ -41,6 +41,7 @@
 import com.apple.foundationdb.tuple.Tuple;
 import com.apple.test.Tags;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -64,8 +65,10 @@
 @Tag(Tags.RequiresFDB)
 public class KeyValueCursorTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
 
     private FDBDatabase fdb;

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/OneOfTest.java

@@ -34,6 +34,7 @@
 import com.apple.test.Tags;
 import com.google.protobuf.Message;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Order;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -47,8 +48,10 @@
 @Tag(Tags.RequiresFDB)
 public class OneOfTest {
     @RegisterExtension
+    @Order(0)
     final FDBDatabaseExtension dbExtension = new FDBDatabaseExtension();
     @RegisterExtension
+    @Order(1)
     final TestKeySpacePathManagerExtension pathManager = new TestKeySpacePathManagerExtension(dbExtension);
     private FDBDatabase fdb;
     private KeySpacePath path;

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/OnlineIndexerMergeTest.java

@@ -50,6 +50,7 @@
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -72,6 +73,7 @@
  * Tests specifically of {@link OnlineIndexer#mergeIndex()}.
  */
 @Tag(Tags.RequiresFDB)
+@Isolated
 public class OnlineIndexerMergeTest extends FDBRecordStoreConcurrentTestBase {
 
     private static final String INDEX_NAME = "mergableIndex";

fdb-record-layer-core/src/test/java/com/apple/foundationdb/record/provider/foundationdb/OnlineIndexerMutualTest.java

@@ -41,6 +41,7 @@
 import com.apple.test.Tags;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.parallel.Isolated;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import org.slf4j.Logger;
@@ -75,6 +76,7 @@
  * Tests for mutually building indexes {@link OnlineIndexer}.
  */
 @Tag(Tags.Slow)
+@Isolated
 class OnlineIndexerMutualTest extends OnlineIndexerTest  {
     private static final Logger LOGGER = LoggerFactory.getLogger(OnlineIndexerMutualTest.class);