Skip to content

feat(scaletest/templates): add support for concurrent scenarios #11753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Jan 30, 2024
Merged

feat(scaletest/templates): add support for concurrent scenarios #11753

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
036aa8d
feat(scaletest/templates): add support for concurrent scenarios
mafredri Jan 22, 2024
17605a7
bump resources to the max
mafredri Jan 22, 2024
806c73f
remove limits entirely
mafredri Jan 22, 2024
96100c0
allow more flexibility in cleanup
mafredri Jan 23, 2024
569cfc1
allow staggered start
mafredri Jan 24, 2024
d0fbd2c
improve cleanup
mafredri Jan 24, 2024
3141efe
fix dashboard screengrabs location
mafredri Jan 24, 2024
f58bf41
add more cleanup cases
mafredri Jan 24, 2024
4754f2f
fix updating of static time
mafredri Jan 24, 2024
1236b93
echo
mafredri Jan 24, 2024
724e1c5
add skip create workspaces option
mafredri Jan 25, 2024
916c74d
fix start time regen
mafredri Jan 25, 2024
aeb9c52
add retry
mafredri Jan 29, 2024
60df607
fix undetected error exit code
mafredri Jan 29, 2024
23d936e
minor cleanup
mafredri Jan 30, 2024
82b95d4
fix typo
mafredri Jan 30, 2024
74812f6
stagger delay mins
mafredri Jan 30, 2024
21bc64b
add note about prom http port name
mafredri Jan 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
minor cleanup
  • Loading branch information
@mafredri
mafredri committed Jan 30, 2024
commit 23d936e2927e371e65fcebb3f0ddb52c6cbdf35d
35 changes: 17 additions & 18 deletions scaletest/templates/scaletest-runner/scripts/run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,14 +92,10 @@ else
fi
annotate_grafana_end greedy_agent "${scenario}: Greedy agent traffic"

return ${status}
return "${status}"
}
fi

if [[ ${SCALETEST_PARAM_LOAD_SCENARIO_RUN_CONCURRENTLY} == 1 ]]; then
start_phase "Load scenarios: ${SCALETEST_PARAM_LOAD_SCENARIOS[*]}"
fi

run_scenario_cmd() {
local scenario=${1}
shift
Expand Down Expand Up @@ -127,6 +123,9 @@ declare -A failed=()
target_start=0
target_end=-1

if [[ ${SCALETEST_PARAM_LOAD_SCENARIO_RUN_CONCURRENTLY} == 1 ]]; then
start_phase "Load scenarios: ${SCALETEST_PARAM_LOAD_SCENARIOS[*]}"
fi
for scenario in "${SCALETEST_PARAM_LOAD_SCENARIOS[@]}"; do
if [[ ${SCALETEST_PARAM_LOAD_SCENARIO_RUN_CONCURRENTLY} == 0 ]]; then
start_phase "Load scenario: ${scenario}"
Expand Down Expand Up @@ -320,24 +319,24 @@ for scenario in "${SCALETEST_PARAM_LOAD_SCENARIOS[@]}"; do
# scenario is run concurrently and all percentages add up to 100.
target_start=${target_end}

if [[ ${SCALETEST_PARAM_LOAD_SCENARIO_RUN_CONCURRENTLY} == 0 ]]; then
if ((status > 0)); then
log "Load scenario failed: ${scenario} (exit=${status})"
failed+=(["${scenario}"]="$status")
PHASE_ADD_TAGS=error end_phase
else
end_phase
fi

wait_baseline "${SCALETEST_PARAM_LOAD_SCENARIO_BASELINE_DURATION}"
else
if [[ ${SCALETEST_PARAM_LOAD_SCENARIO_RUN_CONCURRENTLY} == 1 ]]; then
pid_to_scenario+=(["${pids[-1]}"]="${scenario}")
# Stagger the start of each scenario to avoid a burst of load and deted
# problematic scenarios.
sleep $((SCALETEST_PARAM_LOAD_SCENARIO_CONCURRENCY_STAGGERING * 60))
continue
fi
done

if ((status > 0)); then
log "Load scenario failed: ${scenario} (exit=${status})"
failed+=(["${scenario}"]="${status}")
PHASE_ADD_TAGS=error end_phase
else
end_phase
fi

wait_baseline "${SCALETEST_PARAM_LOAD_SCENARIO_BASELINE_DURATION}"
done
if [[ ${SCALETEST_PARAM_LOAD_SCENARIO_RUN_CONCURRENTLY} == 1 ]]; then
wait "${pids[@]}"
# Wait on all pids will wait until all have exited, but we need to
Expand All @@ -348,7 +347,7 @@ if [[ ${SCALETEST_PARAM_LOAD_SCENARIO_RUN_CONCURRENTLY} == 1 ]]; then
scenario=${pid_to_scenario[${pid}]}
if ((status > 0)); then
log "Load scenario failed: ${scenario} (exit=${status})"
failed+=(["${scenario}"]="$status")
failed+=(["${scenario}"]="${status}")
fi
done
if ((${#failed[@]} > 0)); then
Expand Down