Merge pull request #6388 from apple/revert-6345-ppw-restarting

Revert "add proper downgrade/upgrade test for storage migration with PPW"
2022-02-11 16:08:58 -08:00 · 2022-02-11 16:08:58 -08:00 · 6ac22756a0
parent cb8c5168df 6d3b7c97b8
commit 6ac22756a0
5 changed files with 0 additions and 96 deletions
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -243,9 +243,6 @@ if(WITH_PYTHON)
  add_fdb_test(
    TEST_FILES restarting/to_7.0.0/CycleTestRestart-1.txt
               restarting/to_7.0.0/CycleTestRestart-2.txt)
-  add_fdb_test(
-    TEST_FILES restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
-               restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml)
  add_fdb_test(
    TEST_FILES restarting/from_7.0.0/SnapTestAttrition-1.txt
               restarting/from_7.0.0/SnapTestAttrition-2.txt)
@ -258,11 +255,6 @@ if(WITH_PYTHON)
  add_fdb_test(
    TEST_FILES restarting/from_7.0.0/SnapCycleRestart-1.txt
               restarting/from_7.0.0/SnapCycleRestart-2.txt)
-  add_fdb_test(
-    TEST_FILES restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
-               restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml)
-
-
  add_fdb_test(TEST_FILES slow/ApiCorrectness.toml)
  add_fdb_test(TEST_FILES slow/ApiCorrectnessAtomicRestore.toml)
  add_fdb_test(TEST_FILES slow/ApiCorrectnessSwitchover.toml)
--- a/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
+++ b/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
@ -1,25 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-clearAfterTest = false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 30.0
-    allowTestStorageMigration = true
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-    scale = 0.1
-    clogginess = 2.0
-
-    [[test.workload]]
-    testName='SaveAndKill'
-    restartInfoLocation='simfdb/restartInfo.ini'
-    testDuration=30.0
--- a/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
+++ b/tests/restarting/from_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
@ -1,19 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-runSetup=false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-    scale = 0.1
-    clogginess = 2.0
--- a/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
+++ b/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-1.toml
@ -1,25 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-clearAfterTest = false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 30.0
-    allowTestStorageMigration = true
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 30.0
-    scale = 0.1
-    clogginess = 2.0
-
-    [[test.workload]]
-    testName='SaveAndKill'
-    restartInfoLocation='simfdb/restartInfo.ini'
-    testDuration=30.0
--- a/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
+++ b/tests/restarting/to_7.0.0/ConfigureStorageMigrationTestRestart-2.toml
@ -1,19 +0,0 @@
-extraMachineCountDC = 2
-
-[[test]]
-testTitle = 'CloggedConfigureDatabaseTest'
-runSetup=false
-
-    [[test.workload]]
-    testName = 'ConfigureDatabase'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-
-    [[test.workload]]
-    testName = 'RandomClogging'
-    testDuration = 300.0
-    scale = 0.1
-    clogginess = 2.0