OAK-10844: Skip FullGC BETWEEN_CHECKPOINTS tests by default

oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/BranchCommitGCTest.java

@@ -70,6 +70,14 @@
 @RunWith(Parameterized.class)
 public class BranchCommitGCTest {
 
+    /**
+     * System property to enable BETWEEN_CHECKPOINTS modes in tests.
+     * By default, these modes are disabled due to flakiness and slowness (OAK-10844).
+     * Set to "true" to enable: -Doak.test.enableBetweenCheckpointsModes=true
+     */
+    private static final String ENABLE_BETWEEN_CHECKPOINTS_MODES = 
+            "oak.test.enableBetweenCheckpointsModes";
+
     @Rule
     public DocumentMKBuilderProvider builderProvider = new DocumentMKBuilderProvider();
     private Clock clock;
@@ -79,13 +87,27 @@ public class BranchCommitGCTest {
 
     @Parameterized.Parameters(name="{index}: {0} with {1}")
     public static java.util.Collection<Object[]> params() {
+        boolean enableBetweenCheckpointsModes = Boolean.getBoolean(ENABLE_BETWEEN_CHECKPOINTS_MODES);
         java.util.Collection<Object[]> params = new LinkedList<>();
+        int skippedModes = 0;
         for (Object[] fixture : AbstractDocumentStoreTest.fixtures()) {
             DocumentStoreFixture f = (DocumentStoreFixture)fixture[0];
             for (FullGCMode gcType : FullGCMode.values()) {
+                // OAK-10844: Skip BETWEEN_CHECKPOINTS modes by default
+                if (!enableBetweenCheckpointsModes && 
+                        (gcType == FullGCMode.ORPHANS_EMPTYPROPS_BETWEEN_CHECKPOINTS_NO_UNMERGED_BC ||
+                         gcType == FullGCMode.ORPHANS_EMPTYPROPS_BETWEEN_CHECKPOINTS_WITH_UNMERGED_BC)) {
+                    skippedModes++;
+                    continue;
+                }
                 params.add(new Object[] {f, gcType});
             }
         }
+        if (skippedModes > 0 && !enableBetweenCheckpointsModes) {
+            System.out.println("BranchCommitGCTest: Skipping " + skippedModes + 
+                    " BETWEEN_CHECKPOINTS mode test combinations. " +
+                    "To enable, set system property: -D" + ENABLE_BETWEEN_CHECKPOINTS_MODES + "=true");
+        }
         return params;
     }
 
@@ -540,7 +562,13 @@ public void unmergedRemoveProperty() throws Exception {
         RevisionVector br = unmergedBranchCommit(b -> b.child("foo").removeProperty("a"));
         mergedBranchCommit(b -> b.child("foo").setProperty("c", "d"));
         store.runBackgroundOperations();
-
+        // OAK-12011 : adding a temporary sleep to reduce likelyhood of
+        // backgroundPurge to interfere with test
+        try {
+            Thread.sleep(1000);
+        } catch (InterruptedException e) {
+            fail("got interrupted");
+        }
         // wait two hours
         clock.waitUntil(clock.getTime() + HOURS.toMillis(2));
         // clean everything older than one hour

oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollectorIT.java

@@ -144,6 +144,14 @@
 @Ignore("OAK-11490")
 public class VersionGarbageCollectorIT {
 
+    /**
+     * System property to enable BETWEEN_CHECKPOINTS modes in tests.
+     * By default, these modes are disabled due to flakiness and slowness (OAK-10844).
+     * Set to "true" to enable: -Doak.test.enableBetweenCheckpointsModes=true
+     */
+    private static final String ENABLE_BETWEEN_CHECKPOINTS_MODES = 
+            "oak.test.enableBetweenCheckpointsModes";
+
     // OAK-10845 : temporary hacky exposure of test store to include its dump in error message
     static DocumentNodeStore staticStore;
 
@@ -220,13 +228,17 @@ public GCCounts(FullGCMode mode, int deletedDocGCCount, int deletedPropsCount,
 
     @Parameterized.Parameters(name="{index}: {0} with {1}")
     public static java.util.Collection<Object[]> params() throws IOException {
+        boolean enableBetweenCheckpointsModes = Boolean.getBoolean(ENABLE_BETWEEN_CHECKPOINTS_MODES);
         java.util.Collection<Object[]> params = new LinkedList<>();
+        int skippedModes = 0;
         for (Object[] fixture : AbstractDocumentStoreTest.fixtures()) {
             DocumentStoreFixture f = (DocumentStoreFixture)fixture[0];
             for (FullGCMode gcType : FullGCMode.values()) {
-                if (gcType == FullGCMode.ORPHANS_EMPTYPROPS_BETWEEN_CHECKPOINTS_NO_UNMERGED_BC
-                        || gcType == FullGCMode.ORPHANS_EMPTYPROPS_BETWEEN_CHECKPOINTS_WITH_UNMERGED_BC) {
-                    // temporarily skip due to flakyness
+                // OAK-10844: Skip BETWEEN_CHECKPOINTS modes by default
+                if (!enableBetweenCheckpointsModes && 
+                        (gcType == FullGCMode.ORPHANS_EMPTYPROPS_BETWEEN_CHECKPOINTS_NO_UNMERGED_BC ||
+                         gcType == FullGCMode.ORPHANS_EMPTYPROPS_BETWEEN_CHECKPOINTS_WITH_UNMERGED_BC)) {
+                    skippedModes++;
                     continue;
                 }
                 if (f.getName().equals("Memory") || f.getName().startsWith("RDB")) {
@@ -240,6 +252,11 @@ public static java.util.Collection<Object[]> params() throws IOException {
                 params.add(new Object[] {f, gcType});
             }
         }
+        if (skippedModes > 0 && !enableBetweenCheckpointsModes) {
+            System.out.println("VersionGarbageCollectorIT: Skipping " + skippedModes + 
+                    " BETWEEN_CHECKPOINTS mode test combinations. " +
+                    "To enable, set system property: -D" + ENABLE_BETWEEN_CHECKPOINTS_MODES + "=true");
+        }
         return params;
     }