Merge pull request #6062 from IntersectMBO/fmaste/voting

wb | voting workload
IntersectMBO · Jan 10, 2025 · a5cd0b8 · a5cd0b8
2 parents 307fdd2 + 72d2f40
commit a5cd0b8
Show file tree

Hide file tree

Showing 26 changed files with 2,236 additions and 510 deletions.
diff --git a/nix/workbench/analyse/chain-filters/epoch4+.json b/nix/workbench/analyse/chain-filters/epoch4+.json
@@ -0,0 +1,7 @@
+[ { "tag": "CSlot"
+  , "contents":
+    { "tag": "EpochGEq"
+    , "contents": 3
+    }
+  }
+]
diff --git a/nix/workbench/analyse/chain-filters/epoch5+.json b/nix/workbench/analyse/chain-filters/epoch5+.json
@@ -0,0 +1,7 @@
+[ { "tag": "CSlot"
+  , "contents":
+    { "tag": "EpochGEq"
+    , "contents": 4
+    }
+  }
+]
diff --git a/nix/workbench/backend/backend.sh b/nix/workbench/backend/backend.sh
@@ -24,6 +24,8 @@ usage_backend() {
 
     wait-pools-stopped RUNDIR
                      Wait until all pools are stopped
+    wait-workloads-stopped RUNDIR
+                     Wait until all workloads are stopped
     stop-cluster RUNDIR
     cleanup-cluster RUNDIR
                      Wipe cluster state to pristine
@@ -50,16 +52,16 @@ case "${op}" in
     start-tracers )              backend_$WB_BACKEND "$@";;
     start-nodes )                backend_$WB_BACKEND "$@";;
     start-generator )            backend_$WB_BACKEND "$@";;
+    start-workloads )            backend_$WB_BACKEND "$@";;
     start-healthchecks )         backend_$WB_BACKEND "$@";;
-    start-latencies )            backend_$WB_BACKEND "$@";;
     # Fine grained
     start-node )                 backend_$WB_BACKEND "$@";;
     stop-node )                  backend_$WB_BACKEND "$@";;
     wait-node )                  backend_$WB_BACKEND "$@";;
     wait-node-stopped )          backend_$WB_BACKEND "$@";;
     get-node-socket-path )       backend_$WB_BACKEND "$@";;
     wait-pools-stopped )         backend_$WB_BACKEND "$@";;
-    wait-latencies-stopped )     backend_$WB_BACKEND "$@";;
+    wait-workloads-stopped )     backend_$WB_BACKEND "$@";;
     # Stop functions
     stop-all )                   backend_$WB_BACKEND "$@";;
     fetch-logs )                 backend_$WB_BACKEND "$@";;

diff --git a/nix/workbench/backend/nomad-job.nix b/nix/workbench/backend/nomad-job.nix
@@ -902,28 +902,27 @@ let
             }
           ])
           ++
-          # healthcheck
-          [
-            ## healthcheck start.sh script.
+          # workloads
+          (builtins.map (workload:
+            ## workload start.sh script.
             {
               env = false;
-              destination = "local/${stateDir}/healthcheck/start.sh";
-              data = escapeTemplate
-                profileData.healthcheck-service.start.value;
+              destination = "local/${stateDir}/workloads/${workload.name}/start.sh";
+              data = escapeTemplate workload.start.value;
               change_mode = "noop";
               error_on_missing_key = true;
               perms = "744"; # Only for every "start.sh" script. Default: "644"
             }
-          ]
+          ) profileData.workloads-service)
           ++
-          # latency
+          # healthcheck
           [
-            ## Latency start.sh script.
+            ## healthcheck start.sh script.
             {
               env = false;
-              destination = "local/${stateDir}/latency/start.sh";
+              destination = "local/${stateDir}/healthcheck/start.sh";
               data = escapeTemplate
-                profileData.latency-service.start.value;
+                profileData.healthcheck-service.start.value;
               change_mode = "noop";
               error_on_missing_key = true;
               perms = "744"; # Only for every "start.sh" script. Default: "644"