Merge pull request #11555 from jzhou77/fix

Reduce chance of running rare tests

contrib/Joshua/scripts/correctnessTest.sh

@@ -6,4 +6,5 @@ export ASAN_OPTIONS="detect_leaks=0"
 OLDBINDIR="${OLDBINDIR:-/app/deploy/global_data/oldBinaries}"
 #mono bin/TestHarness.exe joshua-run "${OLDBINDIR}" false
 
+# export RARE_PRIORITY=20
 python3 -m test_harness.app -s ${JOSHUA_SEED} --old-binaries-path ${OLDBINDIR}

contrib/TestHarness2/test_harness/run.py

@@ -70,6 +70,7 @@ class TestPicker:
         self.restart_test: Pattern = re.compile(r".*-\d+\.(txt|toml)")
         self.follow_test: Pattern = re.compile(r".*-[2-9]\d*\.(txt|toml)")
         self.old_binaries: OrderedDict[Version, Path] = binaries
+        self.rare_priority: int = int(os.getenv("RARE_PRIORITY", 10))
 
         for subdir in self.test_dir.iterdir():
             if subdir.is_dir() and subdir.name in config.test_dirs:
@@ -195,6 +196,8 @@ class TestPicker:
                 test_class = test_name
             if priority is None:
                 priority = 1.0
+            if is_rare(path) and priority <= 1.0:
+                priority = self.rare_priority
             if (
                 self.include_tests_regex.search(test_class) is None
                 or self.exclude_tests_regex.search(test_class) is not None
@@ -326,6 +329,9 @@ def is_no_sim(test_file: Path):
     return test_file.parts[-2] == "noSim"
 
 
+def is_rare(test_file: Path):
+	return test_file.parts[-2] == "rare"
+
 class ResourceMonitor(threading.Thread):
     def __init__(self):
         super().__init__()

fdbclient/BackupAgentBase.actor.cpp

@@ -847,8 +847,7 @@ ACTOR Future<int> kvMutationLogToTransactions(Database cx,
 					mutationSize = 0;
 				}
 
-				state int i;
-				for (i = 0; i < curReq.transaction.mutations.size(); i++) {
+				for (int i = 0; i < curReq.transaction.mutations.size(); i++) {
 					req.transaction.mutations.push_back_deep(req.arena, curReq.transaction.mutations[i]);
 					req.transaction.encryptedMutations.push_back_deep(req.arena,
 					                                                  curReq.transaction.encryptedMutations[i]);

tests/CMakeLists.txt

@@ -258,9 +258,16 @@ if(WITH_PYTHON)
     add_fdb_test(TEST_FILES fast/MockDDReadWrite.toml)
   endif()
 
+  add_fdb_test(TEST_FILES rare/BlobGranuleApiCorrectness.toml)
+  add_fdb_test(TEST_FILES rare/BlobGranuleCorrectnessClean.toml)
+  add_fdb_test(TEST_FILES rare/BlobGranuleCorrectness.toml IGNORE)
+  add_fdb_test(TEST_FILES rare/BlobGranuleMergeBoundaries.toml)
   add_fdb_test(TEST_FILES rare/BlobGranuleRanges.toml)
   add_fdb_test(TEST_FILES rare/BlobGranuleRangesChangeLog.toml)
-  add_fdb_test(TEST_FILES rare/BlobGranuleMergeBoundaries.toml)
+  add_fdb_test(TEST_FILES rare/BlobGranuleVerifyBalance.toml)
+  add_fdb_test(TEST_FILES rare/BlobGranuleVerifyBalanceClean.toml)
+  add_fdb_test(TEST_FILES rare/BlobGranuleVerifyLarge.toml IGNORE)
+  add_fdb_test(TEST_FILES rare/BlobGranuleVerifyLargeClean.toml IGNORE)
   add_fdb_test(TEST_FILES rare/CheckRelocation.toml)
   add_fdb_test(TEST_FILES rare/ClogTlog.toml)
   add_fdb_test(TEST_FILES rare/ClogUnclog.toml)
@@ -279,6 +286,9 @@ if(WITH_PYTHON)
   add_fdb_test(TEST_FILES rare/InventoryTestHeavyWrites.toml)
   add_fdb_test(TEST_FILES rare/LargeApiCorrectness.toml)
   add_fdb_test(TEST_FILES rare/LargeApiCorrectnessStatus.toml)
+  add_fdb_test(TEST_FILES rare/MetaclusterManagement.toml)
+  add_fdb_test(TEST_FILES rare/MetaclusterManagementConcurrency.toml)
+  add_fdb_test(TEST_FILES rare/MetaclusterRecovery.toml)
   add_fdb_test(TEST_FILES rare/RYWDisable.toml)
   add_fdb_test(TEST_FILES rare/RandomReadWriteTest.toml)
   add_fdb_test(TEST_FILES rare/ReadSkewReadWrite.toml)
@@ -464,13 +474,6 @@ if(WITH_PYTHON)
   add_fdb_test(TEST_FILES slow/ApiCorrectnessAtomicRestore.toml)
   add_fdb_test(TEST_FILES slow/ApiCorrectnessSwitchover.toml)
   add_fdb_test(TEST_FILES slow/ApiCorrectnessWithConsistencyCheck.toml)
-  add_fdb_test(TEST_FILES slow/BlobGranuleVerifyLarge.toml IGNORE)
-  add_fdb_test(TEST_FILES slow/BlobGranuleVerifyLargeClean.toml IGNORE)
-  add_fdb_test(TEST_FILES slow/BlobGranuleVerifyBalance.toml)
-  add_fdb_test(TEST_FILES slow/BlobGranuleVerifyBalanceClean.toml)
-  add_fdb_test(TEST_FILES slow/BlobGranuleCorrectnessClean.toml)
-  add_fdb_test(TEST_FILES slow/BlobGranuleCorrectness.toml IGNORE)
-  add_fdb_test(TEST_FILES slow/BlobGranuleApiCorrectness.toml)
   add_fdb_test(TEST_FILES slow/ClogWithRollbacks.toml)
   add_fdb_test(TEST_FILES slow/CloggedCycleTest.toml)
   add_fdb_test(TEST_FILES slow/CloggedStorefront.toml)
@@ -487,9 +490,6 @@ if(WITH_PYTHON)
   add_fdb_test(TEST_FILES slow/GcGenerations.toml)
   add_fdb_test(TEST_FILES slow/LongRunning.toml LONG_RUNNING)
   add_fdb_test(TEST_FILES slow/LowLatencyWithFailures.toml)
-  add_fdb_test(TEST_FILES slow/MetaclusterManagement.toml)
-  add_fdb_test(TEST_FILES slow/MetaclusterManagementConcurrency.toml)
-  add_fdb_test(TEST_FILES slow/MetaclusterRecovery.toml)
   add_fdb_test(TEST_FILES slow/MoveKeysClean.toml)
   add_fdb_test(TEST_FILES slow/MoveKeysSideband.toml)
   add_fdb_test(TEST_FILES slow/RyowCorrectness.toml)

tests/rare/CloggedCycleWithKills.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [[test]]
 testTitle = 'CloggedCycleTestWithKills'
 

tests/rare/ConfigDBUnitTest.toml

@@ -1,5 +1,5 @@
 # This test can't run as part of RandomUnitTests.toml, so run it less frequently
-testPriority = '10'
+testPriority = '50'
 
 [[test]]
 testTitle = "ConfigDBUnitTest"

tests/rare/CycleRollbackClogged.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '10'
+
 [[test]]
 testTitle = 'RollbackCycleTest'
 

tests/rare/CycleWithKills.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [[test]]
 testTitle = 'CycleTestWithKills'
 

tests/rare/InventoryTestHeavyWrites.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [[test]]
 testTitle = 'InventoryTestHeavyWrites'
 

tests/rare/PerpetualWiggleStorageMigration.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [configuration]
 config = 'triple'
 storageEngineType = 0

tests/rare/RYWDisable.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [[test]]
 testTitle = 'RYWDisableTest'
 

tests/rare/RedwoodDeltaTree.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '50'
+
 [[test]]
 testTitle = 'RedwoodDeltaTree'
 useDB = false

tests/rare/RestoreMultiRanges.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '10'
+
 [configuration]
 tenantModes = ['disabled']
 

tests/rare/StatusBuilderPerf.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [[test]]
 testTitle = 'StatusBuilderPerf'
 useDB = false

tests/rare/TLogVersionMessagesOverheadFactor.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [[test]]
 testTitle = 'TLogVersionMessagesOverheadFactor'
 useDB = false

tests/rare/Throttling.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [configuration]
 storageEngineExcludeTypes = [5]
 

tests/rare/TransactionCost.toml

@@ -1,3 +1,7 @@
+# High priority number decreases the chance to run this test.
+# Priority 1.0 is the default in TestHarness2
+testPriority = '20'
+
 [configuration]
 storageEngineExcludeTypes=[5]