#146, #84: Change the json cfg files to have experimentConfig section…

… with delay values that were hardwired in testConfig earlier
hashgraph · Mar 24, 2020 · f1eba62 · f1eba62
1 parent e0873c1
commit f1eba62
Show file tree

Hide file tree

Showing 16 changed files with 450 additions and 105 deletions.
diff --git a/configs/testFcfsFreezeCfg.json b/configs/testFcfsFreezeCfg.json
@@ -3,16 +3,35 @@
   "description" : "platform testing demo - FileSequential",
   "duration": 60,
   "settings": [
-    {"name":"showInternalStats", "value": "1" },
-    {"name":"csvFileName", "value":"PlatformTesting" },
-    {"name":"csvAppend", "value":"true"}
+    {
+      "name": "showInternalStats",
+      "value": "1"
+    },
+    {
+      "name": "csvFileName",
+      "value": "PlatformTesting"
+    },
+    {
+      "name": "csvAppend",
+      "value": "true"
+    }
   ],
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FileFreeze.json"]
+    "parameterList": [
+      "FileFreeze.json"
+    ]
+  },
+  "experimentConfig": {
+    "experimentRestartDelay": "5",
+    "experimentStartDelay": "2",
+    "freezeWaitMillis": "30000"
   },
   "resultFiles": [
     "swirlds.log"
   ],
-  "validator": [ "STATS", "PLATFORM_TESTING_DEMO" ]
+  "validator": [
+    "STATS",
+    "PLATFORM_TESTING_DEMO"
+  ]
 }
diff --git a/configs/testFcm1KCfg.json b/configs/testFcm1KCfg.json
@@ -1,15 +1,26 @@
 {
-  "name":"FCM1K",
-  "description" : "platform testing demo - FCM1K",
-  "duration": 540,
+  "name": "FCM1K",
+  "description": "platform testing demo - FCM1K",
+  "duration": 60,
   "settings": [
-    {"name":"showInternalStats", "value": "1" },
-    {"name":"csvFileName", "value":"PlatformTesting" },
-    {"name":"csvAppend", "value":"true"}
+    {
+      "name": "showInternalStats",
+      "value": "1"
+    },
+    {
+      "name": "csvFileName",
+      "value": "PlatformTesting"
+    },
+    {
+      "name": "csvAppend",
+      "value": "true"
+    }
   ],
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FCM1K.json"]
+    "parameterList": [
+      "FCM1K.json"
+    ]
   },
   "resultFiles": [
     "swirlds.log"

diff --git a/configs/testFcmFreezeBlobCfg.json b/configs/testFcmFreezeBlobCfg.json
@@ -6,22 +6,37 @@
     {"name":"showInternalStats", "value": "1" },
     {"name":"csvFileName", "value":"PlatformTesting" },
     {"name":"csvAppend", "value":"true"},
-    {"name":"state.saveStatePeriod", "value":"300"}
+    {
+      "name": "state.saveStatePeriod",
+      "value": "300"
+    }
   ],
   "freezeConfig": {
     "freezeTiming": 1,
     "freezeIterations": 5,
     "postFreezeApp": {
       "jar": "PlatformTestingApp.jar",
-      "parameterList": ["FCMBlob1K.json"]
+      "parameterList": [
+        "FCMBlob1K.json"
+      ]
     }
   },
+  "experimentConfig": {
+    "experimentRestartDelay": "5",
+    "experimentStartDelay": "2",
+    "freezeWaitMillis": "30000"
+  },
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FCM1KFreezeBlob.json"]
+    "parameterList": [
+      "FCM1KFreezeBlob.json"
+    ]
   },
   "resultFiles": [
     "swirlds.log"
   ],
-  "validator": [ "STATS", "RESTART" ]
+  "validator": [
+    "STATS",
+    "RESTART"
+  ]
 }
diff --git a/configs/testFcmFreezeCfg.json b/configs/testFcmFreezeCfg.json
@@ -6,22 +6,37 @@
     {"name":"showInternalStats", "value": "1" },
     {"name":"csvFileName", "value":"PlatformTesting" },
     {"name":"csvAppend", "value":"true"},
-    {"name":"state.saveStatePeriod", "value":"300"}
+    {
+      "name": "state.saveStatePeriod",
+      "value": "300"
+    }
   ],
   "freezeConfig": {
     "freezeTiming": 1,
     "freezeIterations": 5,
     "postFreezeApp": {
       "jar": "PlatformTestingApp.jar",
-      "parameterList": ["FCM1K.json"]
+      "parameterList": [
+        "FCM1K.json"
+      ]
     }
   },
+  "experimentConfig": {
+    "experimentRestartDelay": "5",
+    "experimentStartDelay": "2",
+    "freezeWaitMillis": "30000"
+  },
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FCM1KFreeze.json"]
+    "parameterList": [
+      "FCM1KFreeze.json"
+    ]
   },
   "resultFiles": [
     "swirlds.log"
   ],
-  "validator": [ "STATS", "RESTART" ]
+  "validator": [
+    "STATS",
+    "RESTART"
+  ]
 }
diff --git a/configs/testFcmFreezeFCQCfg.json b/configs/testFcmFreezeFCQCfg.json
@@ -6,22 +6,37 @@
     {"name":"showInternalStats", "value": "1" },
     {"name":"csvFileName", "value":"PlatformTesting" },
     {"name":"csvAppend", "value":"true"},
-    {"name":"state.saveStatePeriod", "value":"300"}
+    {
+      "name": "state.saveStatePeriod",
+      "value": "300"
+    }
   ],
   "freezeConfig": {
     "freezeTiming": 1,
     "freezeIterations": 5,
     "postFreezeApp": {
       "jar": "PlatformTestingApp.jar",
-      "parameterList": ["FCM1K.json"]
+      "parameterList": [
+        "FCM1K.json"
+      ]
     }
   },
+  "experimentConfig": {
+    "experimentRestartDelay": "5",
+    "experimentStartDelay": "2",
+    "freezeWaitMillis": "30000"
+  },
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FCM1KFreezeFCQ.json"]
+    "parameterList": [
+      "FCM1KFreezeFCQ.json"
+    ]
   },
   "resultFiles": [
     "swirlds.log"
   ],
-  "validator": [ "STATS", "RESTART" ]
+  "validator": [
+    "STATS",
+    "RESTART"
+  ]
 }
diff --git a/configs/testReconnectBlobCfg.json b/configs/testReconnectBlobCfg.json
@@ -6,22 +6,47 @@
     {"name": "throttle7extra", "value": "0.02" },
     {"name":"throttle7", "value": "1" },
     {"name":"throttle7threshold", "value": "1.5" },
-    {"name":"showInternalStats", "value": "1" },
-    {"name":"csvFileName", "value":"PlatformTesting" },
-    {"name":"csvAppend", "value":"true"},
-    {"name":"reconnectActive", "value":"1"},
-    {"name":"enableEventStreaming", "value":"true"}
+    {
+      "name": "showInternalStats",
+      "value": "1"
+    },
+    {
+      "name": "csvFileName",
+      "value": "PlatformTesting"
+    },
+    {
+      "name": "csvAppend",
+      "value": "true"
+    },
+    {
+      "name": "reconnectActive",
+      "value": "1"
+    },
+    {
+      "name": "enableEventStreaming",
+      "value": "true"
+    }
   ],
   "reconnectConfig": {
     "reconnectTiming": 180,
     "killNetworkReconnect": true
   },
+  "experimentConfig": {
+    "experimentRestartDelay": "5",
+    "experimentStartDelay": "2",
+    "freezeWaitMillis": "30000"
+  },
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FCMReconnectBlob.json"]
+    "parameterList": [
+      "FCMReconnectBlob.json"
+    ]
   },
   "resultFiles": [
     "swirlds.log"
   ],
-  "validator": [ "STATS", "RECONNECT" ]
+  "validator": [
+    "STATS",
+    "RECONNECT"
+  ]
 }
diff --git a/configs/testReconnectBlobMultiReconnectCfg.json b/configs/testReconnectBlobMultiReconnectCfg.json
@@ -8,22 +8,47 @@
     {"name":"throttle7threshold", "value": "1.5" },
 
     {"name":"showInternalStats", "value": "1" },
-    {"name":"csvFileName", "value":"PlatformTesting" },
-    {"name":"csvAppend", "value":"true"},
-    {"name":"reconnectActive", "value":"1"},
-    {"name":"enableEventStreaming", "value":"true"},
-    {"name":"roundsExpired", "value":"250"}
+    {
+      "name": "csvFileName",
+      "value": "PlatformTesting"
+    },
+    {
+      "name": "csvAppend",
+      "value": "true"
+    },
+    {
+      "name": "reconnectActive",
+      "value": "1"
+    },
+    {
+      "name": "enableEventStreaming",
+      "value": "true"
+    },
+    {
+      "name": "roundsExpired",
+      "value": "250"
+    }
   ],
   "reconnectConfig": {
     "reconnectTiming": 180,
     "killNetworkReconnect": true
   },
+  "experimentConfig": {
+    "experimentRestartDelay": "5",
+    "experimentStartDelay": "2",
+    "freezeWaitMillis": "30000"
+  },
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FCMMultiReconnectBlob.json"]
+    "parameterList": [
+      "FCMMultiReconnectBlob.json"
+    ]
   },
   "resultFiles": [
     "swirlds.log"
   ],
-  "validator": [ "STATS", "RECONNECT" ]
+  "validator": [
+    "STATS",
+    "RECONNECT"
+  ]
 }
diff --git a/configs/testReconnectCfg.json b/configs/testReconnectCfg.json
@@ -5,22 +5,47 @@
   "settings": [
     {"name": "throttle7extra", "value": "0.02" },
     {"name":"throttle7", "value": "1" },
-    {"name":"throttle7threshold", "value": "1.5" },
-    {"name":"showInternalStats", "value": "1" },
-    {"name":"csvFileName", "value":"PlatformTesting" },
-    {"name":"csvAppend", "value":"true"},
-    {"name":"reconnectActive", "value":"1"}
+    {
+      "name": "throttle7threshold",
+      "value": "1.5"
+    },
+    {
+      "name": "showInternalStats",
+      "value": "1"
+    },
+    {
+      "name": "csvFileName",
+      "value": "PlatformTesting"
+    },
+    {
+      "name": "csvAppend",
+      "value": "true"
+    },
+    {
+      "name": "reconnectActive",
+      "value": "1"
+    }
   ],
   "reconnectConfig": {
     "reconnectTiming": 180,
     "killNetworkReconnect": true
   },
+  "experimentConfig": {
+    "experimentRestartDelay": "5",
+    "experimentStartDelay": "2",
+    "freezeWaitMillis": "30000"
+  },
   "app": {
     "jar": "PlatformTestingApp.jar",
-    "parameterList": ["FCMReconnect.json"]
+    "parameterList": [
+      "FCMReconnect.json"
+    ]
   },
   "resultFiles": [
     "swirlds.log"
   ],
-  "validator": [ "STATS", "RECONNECT" ]
+  "validator": [
+    "STATS",
+    "RECONNECT"
+  ]
 }