From 43c3f1a30d5c3d5ba0976e53c93eccc4876c79a1 Mon Sep 17 00:00:00 2001
From: Yi Wu <yi.wu@snowflake.com>
Date: Thu, 6 Oct 2022 14:37:28 -0700
Subject: [PATCH 1/5] Fix storageEngineExcludeTypes format in test specs

---
 tests/restarting/from_7.1.0/SnapCycleRestart-1.txt       | 2 +-
 tests/restarting/from_7.1.0/SnapCycleRestart-2.txt       | 2 +-
 tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt | 2 +-
 tests/restarting/from_7.1.0/SnapIncrementalRestore-2.txt | 2 +-
 tests/restarting/from_7.1.0/SnapTestAttrition-1.txt      | 2 +-
 tests/restarting/from_7.1.0/SnapTestAttrition-2.txt      | 2 +-
 tests/restarting/from_7.1.0/SnapTestRestart-1.txt        | 2 +-
 tests/restarting/from_7.1.0/SnapTestRestart-2.txt        | 2 +-
 tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt  | 2 +-
 tests/restarting/from_7.1.0/SnapTestSimpleRestart-2.txt  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/restarting/from_7.1.0/SnapCycleRestart-1.txt b/tests/restarting/from_7.1.0/SnapCycleRestart-1.txt
index 2df70a8f0f..fa25d1aeab 100644
--- a/tests/restarting/from_7.1.0/SnapCycleRestart-1.txt
+++ b/tests/restarting/from_7.1.0/SnapCycleRestart-1.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[3, 4, 5]
+storageEngineExcludeTypes=3,4,5
 
 ;Take snap and do cycle test
 testTitle=SnapCyclePre
diff --git a/tests/restarting/from_7.1.0/SnapCycleRestart-2.txt b/tests/restarting/from_7.1.0/SnapCycleRestart-2.txt
index 9ec734929e..26680de04a 100644
--- a/tests/restarting/from_7.1.0/SnapCycleRestart-2.txt
+++ b/tests/restarting/from_7.1.0/SnapCycleRestart-2.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[4, 5]
+storageEngineExcludeTypes=4,5
 buggify=off
 
 testTitle=SnapCycleRestore
diff --git a/tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt b/tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt
index b464eda8e3..ccc5df5a30 100644
--- a/tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt
+++ b/tests/restarting/from_7.1.0/SnapIncrementalRestore-1.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[3, 4, 5]
+storageEngineExcludeTypes=3,4,5
 
 logAntiQuorum = 0
 
diff --git a/tests/restarting/from_7.1.0/SnapIncrementalRestore-2.txt b/tests/restarting/from_7.1.0/SnapIncrementalRestore-2.txt
index 1aa1596fc7..cfb02efc9d 100644
--- a/tests/restarting/from_7.1.0/SnapIncrementalRestore-2.txt
+++ b/tests/restarting/from_7.1.0/SnapIncrementalRestore-2.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[4, 5]
+storageEngineExcludeTypes=4,5
 
 testTitle=RestoreBackup
 simBackupAgents=BackupToFile
diff --git a/tests/restarting/from_7.1.0/SnapTestAttrition-1.txt b/tests/restarting/from_7.1.0/SnapTestAttrition-1.txt
index 84ff6bccbc..7b0338f1ce 100644
--- a/tests/restarting/from_7.1.0/SnapTestAttrition-1.txt
+++ b/tests/restarting/from_7.1.0/SnapTestAttrition-1.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[3, 4, 5]
+storageEngineExcludeTypes=3,4,5
 
 ;write 1000 Keys ending with even numbers
 testTitle=SnapTestPre
diff --git a/tests/restarting/from_7.1.0/SnapTestAttrition-2.txt b/tests/restarting/from_7.1.0/SnapTestAttrition-2.txt
index dde9dab0e2..c113a2e304 100644
--- a/tests/restarting/from_7.1.0/SnapTestAttrition-2.txt
+++ b/tests/restarting/from_7.1.0/SnapTestAttrition-2.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[4, 5]
+storageEngineExcludeTypes=4,5
 
 buggify=off
 
diff --git a/tests/restarting/from_7.1.0/SnapTestRestart-1.txt b/tests/restarting/from_7.1.0/SnapTestRestart-1.txt
index e47db390e1..c090398e7c 100644
--- a/tests/restarting/from_7.1.0/SnapTestRestart-1.txt
+++ b/tests/restarting/from_7.1.0/SnapTestRestart-1.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[3, 4, 5]
+storageEngineExcludeTypes=3,4,5
 
 ;write 1000 Keys ending with even numbers
 testTitle=SnapTestPre
diff --git a/tests/restarting/from_7.1.0/SnapTestRestart-2.txt b/tests/restarting/from_7.1.0/SnapTestRestart-2.txt
index 8ee3b0b5ab..f01065eb73 100644
--- a/tests/restarting/from_7.1.0/SnapTestRestart-2.txt
+++ b/tests/restarting/from_7.1.0/SnapTestRestart-2.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[4, 5]
+storageEngineExcludeTypes=4,5
 
 buggify=off
 
diff --git a/tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt b/tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt
index bb5a85efe1..293ff590ed 100644
--- a/tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt
+++ b/tests/restarting/from_7.1.0/SnapTestSimpleRestart-1.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[3, 4, 5]
+storageEngineExcludeTypes=3,4,5
 
 ;write 1000 Keys ending with even number
 testTitle=SnapSimplePre
diff --git a/tests/restarting/from_7.1.0/SnapTestSimpleRestart-2.txt b/tests/restarting/from_7.1.0/SnapTestSimpleRestart-2.txt
index 103eb53d1d..c7cc7f4da1 100644
--- a/tests/restarting/from_7.1.0/SnapTestSimpleRestart-2.txt
+++ b/tests/restarting/from_7.1.0/SnapTestSimpleRestart-2.txt
@@ -1,4 +1,4 @@
-storageEngineExcludeTypes=[4, 5]
+storageEngineExcludeTypes=4,5
 
 buggify=off
 

From 318d11d98e35ff12b61c48fd1ba01efb0ea2a4f8 Mon Sep 17 00:00:00 2001
From: Yi Wu <yi.wu@snowflake.com>
Date: Thu, 6 Oct 2022 15:27:40 -0700
Subject: [PATCH 2/5] further disabling Redwood from VersionVector*Restart
 tests

---
 tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml | 2 ++
 tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml  | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
index 0e143bfe22..db99c1ed08 100644
--- a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
@@ -1,3 +1,5 @@
+storageEngineExcludeTypes=3
+
 [[knobs]]
 enable_version_vector = true
 enable_version_vector_tlog_unicast = true
diff --git a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
index 05b9d7a710..72bd30b194 100644
--- a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
@@ -1,3 +1,5 @@
+storageEngineExcludeTypes=3
+
 [[knobs]]
 enable_version_vector = false
 enable_version_vector_tlog_unicast = false

From d4513c73e193716a8f40bbc7bcf1994489920d6d Mon Sep 17 00:00:00 2001
From: Yi Wu <yi.wu@snowflake.com>
Date: Thu, 6 Oct 2022 16:26:51 -0700
Subject: [PATCH 3/5] fix

---
 tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml | 3 ++-
 tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
index db99c1ed08..4bd3400efa 100644
--- a/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorDisableRestart-1.toml
@@ -1,4 +1,5 @@
-storageEngineExcludeTypes=3
+[configuration]
+storageEngineExcludeTypes = [3]
 
 [[knobs]]
 enable_version_vector = true
diff --git a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
index 72bd30b194..c0a26bbf15 100644
--- a/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
+++ b/tests/restarting/from_7.1.0/VersionVectorEnableRestart-1.toml
@@ -1,4 +1,5 @@
-storageEngineExcludeTypes=3
+[configuration]
+storageEngineExcludeTypes = [3]
 
 [[knobs]]
 enable_version_vector = false

From d247996a177cd4e889c8ed3cd367efc17b8fad4b Mon Sep 17 00:00:00 2001
From: Yi Wu <yi.wu@snowflake.com>
Date: Thu, 6 Oct 2022 17:30:59 -0700
Subject: [PATCH 4/5] disabling Redwood for more 7.1.0 restart tests

---
 .../from_7.1.0/ConfigureStorageMigrationTestRestart-1.toml     | 1 +
 tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml        | 3 +++
 .../to_7.1.0/ConfigureStorageMigrationTestRestart-1.toml       | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/restarting/from_7.1.0/ConfigureStorageMigrationTestRestart-1.toml b/tests/restarting/from_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
index 162b8c68a1..84cad2f104 100644
--- a/tests/restarting/from_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
+++ b/tests/restarting/from_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
@@ -1,5 +1,6 @@
 [configuration]
 extraMachineCountDC = 2
+storageEngineExcludeTypes = [3]
 
 [[test]]
 testTitle = 'CloggedConfigureDatabaseTest'
diff --git a/tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml b/tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml
index ce86368647..abf0abc85e 100644
--- a/tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml
+++ b/tests/restarting/from_7.1.0/ConfigureTestRestart-1.toml
@@ -1,3 +1,6 @@
+[configuration]
+storageEngineExcludeTypes = [3]
+
 [[test]]
 testTitle='CloggedConfigureDatabaseTest'
 clearAfterTest=false
diff --git a/tests/restarting/to_7.1.0/ConfigureStorageMigrationTestRestart-1.toml b/tests/restarting/to_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
index 234c1c1136..07640495a0 100644
--- a/tests/restarting/to_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
+++ b/tests/restarting/to_7.1.0/ConfigureStorageMigrationTestRestart-1.toml
@@ -3,7 +3,7 @@ extraMachineCountDC = 2
 maxTLogVersion=6
 disableHostname=true
 disableEncryption=true
-storageEngineExcludeTypes=[4]
+storageEngineExcludeTypes=[3,4]
 
 [[test]]
 testTitle = 'CloggedConfigureDatabaseTest'

From 0d405d0bc9bcc9c5667666e3380ae415837fe12f Mon Sep 17 00:00:00 2001
From: Yi Wu <yi.wu@snowflake.com>
Date: Thu, 6 Oct 2022 20:47:59 -0700
Subject: [PATCH 5/5] fix from_7.0.0/UpgradeAndBackupRestore

---
 tests/restarting/from_7.0.0/UpgradeAndBackupRestore-1.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/restarting/from_7.0.0/UpgradeAndBackupRestore-1.toml b/tests/restarting/from_7.0.0/UpgradeAndBackupRestore-1.toml
index f0f2141778..289d5c3d1d 100644
--- a/tests/restarting/from_7.0.0/UpgradeAndBackupRestore-1.toml
+++ b/tests/restarting/from_7.0.0/UpgradeAndBackupRestore-1.toml
@@ -1,4 +1,5 @@
-storageEngineExcludeTypes=3
+[configuration]
+storageEngineExcludeTypes=[3]
 
 [[test]]
 testTitle = 'SubmitBackup'