From 24cbe313a136987907bc026c4247065dc2dcd8ac Mon Sep 17 00:00:00 2001
From: sramamoorthy <sramamoorthy@snowflake.net>
Date: Tue, 18 Jun 2019 15:05:10 -0700
Subject: [PATCH] Snap*Restart in ver 2 and buggify off in restore

---
 .../from_6.2.0/SnapCycleRestart-1.txt         |  1 +
 .../from_6.2.0/SnapCycleRestart-2.txt         | 13 +++---
 .../from_6.2.0/SnapTestAttrition-1.txt        | 46 +++++++++++++++++++
 .../from_6.2.0/SnapTestAttrition-2.txt        |  8 ++++
 .../from_6.2.0/SnapTestRestart-1.txt          |  1 +
 .../from_6.2.0/SnapTestRestart-2.txt          |  1 +
 .../from_6.2.0/SnapTestSimpleRestart-1.txt    |  1 +
 .../from_6.2.0/SnapTestSimpleRestart-2.txt    |  1 +
 8 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100644 tests/restarting/from_6.2.0/SnapTestAttrition-1.txt
 create mode 100644 tests/restarting/from_6.2.0/SnapTestAttrition-2.txt

diff --git a/tests/restarting/from_6.2.0/SnapCycleRestart-1.txt b/tests/restarting/from_6.2.0/SnapCycleRestart-1.txt
index 2a1a8f275c..e5def411f8 100644
--- a/tests/restarting/from_6.2.0/SnapCycleRestart-1.txt
+++ b/tests/restarting/from_6.2.0/SnapCycleRestart-1.txt
@@ -12,6 +12,7 @@ testTitle=SnapCyclePre
         maxSnapDelay=10.0
         testID=1
         clearAfterTest=false
+        version=2
 
 testTitle=SnapCycleShutdown
 ;save and shutdown
diff --git a/tests/restarting/from_6.2.0/SnapCycleRestart-2.txt b/tests/restarting/from_6.2.0/SnapCycleRestart-2.txt
index 0ea01d0984..ec70f26cca 100644
--- a/tests/restarting/from_6.2.0/SnapCycleRestart-2.txt
+++ b/tests/restarting/from_6.2.0/SnapCycleRestart-2.txt
@@ -1,8 +1,9 @@
 testTitle=SnapCycleRestore
 ;Post snap restore test
-        runSetup=false
-        testName=Cycle
-        transactionsPerSecond=2500.0
-        nodeCount=2500
-        testDuration=10.0
-        expectedRate=0
+runSetup=false
+testName=Cycle
+transactionsPerSecond=2500.0
+nodeCount=2500
+testDuration=10.0
+expectedRate=0
+buggify=off
diff --git a/tests/restarting/from_6.2.0/SnapTestAttrition-1.txt b/tests/restarting/from_6.2.0/SnapTestAttrition-1.txt
new file mode 100644
index 0000000000..2cee2cafd0
--- /dev/null
+++ b/tests/restarting/from_6.2.0/SnapTestAttrition-1.txt
@@ -0,0 +1,46 @@
+testTitle=SnapTestPre
+;write 1000 Keys ending with even numbers
+        testName=SnapTest
+        numSnaps=1
+        maxSnapDelay=3.0
+        testID=0
+        clearAfterTest=false
+
+testTitle=SnapTestTakeSnap
+;Take snap and do read/write
+        testName=ReadWrite
+        testDuration=10.0
+        transactionsPerSecond=10000
+        writesPerTransactionA=0
+        readsPerTransactionA=10
+        writesPerTransactionB=10
+        readsPerTransactionB=1
+        alpha=0.5
+        nodeCount=100000
+        valueBytes=16
+        discardEdgeMeasurements=false
+
+        testName=SnapTest
+        numSnaps=1
+        maxSnapDelay=10.0
+        testID=1
+        clearAfterTest=false
+        version=2
+
+        testName=Attrition
+        testDuration=10.0
+
+testTitle=SnapTestPost
+;write 1000 Keys ending with odd numbers
+        testName=SnapTest
+        numSnaps=1
+        maxSnapDelay=25.0
+        testID=2
+        clearAfterTest=false
+
+; save and shutdown
+testTitle=SnapSimpleShutdown
+        testName=SaveAndKill
+        restartInfoLocation=simfdb/restartInfo.ini
+        testDuration=10.0
+        isRestoring=1
diff --git a/tests/restarting/from_6.2.0/SnapTestAttrition-2.txt b/tests/restarting/from_6.2.0/SnapTestAttrition-2.txt
new file mode 100644
index 0000000000..5c4d283af8
--- /dev/null
+++ b/tests/restarting/from_6.2.0/SnapTestAttrition-2.txt
@@ -0,0 +1,8 @@
+; verify all keys are even numbered
+testTitle=SnapTestVerify
+testName=SnapTest
+numSnaps=1
+maxSnapDelay=3.0
+testID=3
+restartInfoLocation=simfdb/restartInfo.ini
+buggify=off
diff --git a/tests/restarting/from_6.2.0/SnapTestRestart-1.txt b/tests/restarting/from_6.2.0/SnapTestRestart-1.txt
index f3aeb58b2b..455d1d450a 100644
--- a/tests/restarting/from_6.2.0/SnapTestRestart-1.txt
+++ b/tests/restarting/from_6.2.0/SnapTestRestart-1.txt
@@ -25,6 +25,7 @@ testTitle=SnapTestTakeSnap
         maxSnapDelay=10.0
         testID=1
         clearAfterTest=false
+        version=2
 
 testTitle=SnapTestPost
 ;write 1000 Keys ending with odd numbers
diff --git a/tests/restarting/from_6.2.0/SnapTestRestart-2.txt b/tests/restarting/from_6.2.0/SnapTestRestart-2.txt
index b8bdfc6b34..84e663d1f5 100644
--- a/tests/restarting/from_6.2.0/SnapTestRestart-2.txt
+++ b/tests/restarting/from_6.2.0/SnapTestRestart-2.txt
@@ -4,3 +4,4 @@ testName=SnapTest
 numSnaps=1
 maxSnapDelay=3.0
 testID=3
+buggify=off
diff --git a/tests/restarting/from_6.2.0/SnapTestSimpleRestart-1.txt b/tests/restarting/from_6.2.0/SnapTestSimpleRestart-1.txt
index bf74326ecc..bc35cc868d 100644
--- a/tests/restarting/from_6.2.0/SnapTestSimpleRestart-1.txt
+++ b/tests/restarting/from_6.2.0/SnapTestSimpleRestart-1.txt
@@ -13,6 +13,7 @@ testTitle=SnapSimpleTakeSnap
         maxSnapDelay=5.0
         testID=1
         clearAfterTest=false
+        version=2
 
 ;write 1000 Keys ending with odd number
 testTitle=SnapSimplePost
diff --git a/tests/restarting/from_6.2.0/SnapTestSimpleRestart-2.txt b/tests/restarting/from_6.2.0/SnapTestSimpleRestart-2.txt
index 6e17c33151..dc7294b705 100644
--- a/tests/restarting/from_6.2.0/SnapTestSimpleRestart-2.txt
+++ b/tests/restarting/from_6.2.0/SnapTestSimpleRestart-2.txt
@@ -4,3 +4,4 @@ testName=SnapTest
 numSnaps=1
 maxSnapDelay=3.0
 testID=3
+buggify=off