Skip to content

Commit a5cd0b8

Browse files
authored
Merge pull request #6062 from IntersectMBO/fmaste/voting
wb | voting workload
2 parents 307fdd2 + 72d2f40 commit a5cd0b8

26 files changed

+2236
-510
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[ { "tag": "CSlot"
2+
, "contents":
3+
{ "tag": "EpochGEq"
4+
, "contents": 3
5+
}
6+
}
7+
]
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
[ { "tag": "CSlot"
2+
, "contents":
3+
{ "tag": "EpochGEq"
4+
, "contents": 4
5+
}
6+
}
7+
]

nix/workbench/backend/backend.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ usage_backend() {
2424
2525
wait-pools-stopped RUNDIR
2626
Wait until all pools are stopped
27+
wait-workloads-stopped RUNDIR
28+
Wait until all workloads are stopped
2729
stop-cluster RUNDIR
2830
cleanup-cluster RUNDIR
2931
Wipe cluster state to pristine
@@ -50,16 +52,16 @@ case "${op}" in
5052
start-tracers ) backend_$WB_BACKEND "$@";;
5153
start-nodes ) backend_$WB_BACKEND "$@";;
5254
start-generator ) backend_$WB_BACKEND "$@";;
55+
start-workloads ) backend_$WB_BACKEND "$@";;
5356
start-healthchecks ) backend_$WB_BACKEND "$@";;
54-
start-latencies ) backend_$WB_BACKEND "$@";;
5557
# Fine grained
5658
start-node ) backend_$WB_BACKEND "$@";;
5759
stop-node ) backend_$WB_BACKEND "$@";;
5860
wait-node ) backend_$WB_BACKEND "$@";;
5961
wait-node-stopped ) backend_$WB_BACKEND "$@";;
6062
get-node-socket-path ) backend_$WB_BACKEND "$@";;
6163
wait-pools-stopped ) backend_$WB_BACKEND "$@";;
62-
wait-latencies-stopped ) backend_$WB_BACKEND "$@";;
64+
wait-workloads-stopped ) backend_$WB_BACKEND "$@";;
6365
# Stop functions
6466
stop-all ) backend_$WB_BACKEND "$@";;
6567
fetch-logs ) backend_$WB_BACKEND "$@";;

nix/workbench/backend/nomad-job.nix

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -902,28 +902,27 @@ let
902902
}
903903
])
904904
++
905-
# healthcheck
906-
[
907-
## healthcheck start.sh script.
905+
# workloads
906+
(builtins.map (workload:
907+
## workload start.sh script.
908908
{
909909
env = false;
910-
destination = "local/${stateDir}/healthcheck/start.sh";
911-
data = escapeTemplate
912-
profileData.healthcheck-service.start.value;
910+
destination = "local/${stateDir}/workloads/${workload.name}/start.sh";
911+
data = escapeTemplate workload.start.value;
913912
change_mode = "noop";
914913
error_on_missing_key = true;
915914
perms = "744"; # Only for every "start.sh" script. Default: "644"
916915
}
917-
]
916+
) profileData.workloads-service)
918917
++
919-
# latency
918+
# healthcheck
920919
[
921-
## Latency start.sh script.
920+
## healthcheck start.sh script.
922921
{
923922
env = false;
924-
destination = "local/${stateDir}/latency/start.sh";
923+
destination = "local/${stateDir}/healthcheck/start.sh";
925924
data = escapeTemplate
926-
profileData.latency-service.start.value;
925+
profileData.healthcheck-service.start.value;
927926
change_mode = "noop";
928927
error_on_missing_key = true;
929928
perms = "744"; # Only for every "start.sh" script. Default: "644"

0 commit comments

Comments
 (0)