Skip to content

Commit e350a34

Browse files
committed
Move showing benchmark params to bench.sh for simplicity
1 parent c087f8f commit e350a34

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

.github/workflows/benchmark.yml

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ env:
6666
DURATION_SEC: ${{ github.event.inputs.duration_sec || '30' }}
6767
REQUEST_TIMEOUT: ${{ github.event.inputs.request_timeout || '60s' }}
6868
CONNECTIONS: ${{ github.event.inputs.connections || '10' }}
69-
MAX_CONNECTIONS: ${{ github.event.inputs.max_connections || github.event.inputs.connections || '10' }}
69+
MAX_CONNECTIONS: ${{ github.event.inputs.max_connections }}
7070
WEB_CONCURRENCY: ${{ github.event.inputs.web_concurrency || '4' }}
7171
RAILS_MAX_THREADS: ${{ github.event.inputs.rails_max_threads || '3' }}
72-
RAILS_MIN_THREADS: ${{ github.event.inputs.rails_min_threads || github.event.inputs.rails_max_threads || '3' }}
72+
RAILS_MIN_THREADS: ${{ github.event.inputs.rails_min_threads }}
7373
TOOLS: ${{ github.event.inputs.tools || 'fortio,vegeta,k6' }}
7474

7575
jobs:
@@ -271,19 +271,6 @@ jobs:
271271
run: |
272272
set -e # Exit on any error
273273
echo "🏃 Running benchmark suite..."
274-
echo "Script: spec/performance/bench.sh"
275-
echo ""
276-
echo "Benchmark parameters:"
277-
echo " - RATE: ${RATE}"
278-
echo " - DURATION_SEC: ${DURATION_SEC}"
279-
echo " - REQUEST_TIMEOUT: ${REQUEST_TIMEOUT}"
280-
echo " - CONNECTIONS: ${CONNECTIONS}"
281-
echo " - MAX_CONNECTIONS: ${MAX_CONNECTIONS}"
282-
echo " - WEB_CONCURRENCY: ${WEB_CONCURRENCY}"
283-
echo " - RAILS_MAX_THREADS: ${RAILS_MAX_THREADS}"
284-
echo " - RAILS_MIN_THREADS: ${RAILS_MIN_THREADS}"
285-
echo " - TOOLS: ${TOOLS}"
286-
echo ""
287274
288275
if ! spec/performance/bench.sh; then
289276
echo "❌ ERROR: Benchmark execution failed"

spec/performance/bench.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,18 @@ for cmd in ${TOOLS//,/ } jq column awk tee bc; do
5656
fi
5757
done
5858

59+
echo "Benchmark parameters:
60+
- RATE: ${RATE:-unset}
61+
- DURATION_SEC: ${DURATION_SEC:-unset}
62+
- REQUEST_TIMEOUT: ${REQUEST_TIMEOUT:-unset}
63+
- CONNECTIONS: ${CONNECTIONS:-unset}
64+
- MAX_CONNECTIONS: ${MAX_CONNECTIONS:-unset}
65+
- WEB_CONCURRENCY: ${WEB_CONCURRENCY:-unset}
66+
- RAILS_MAX_THREADS: ${RAILS_MAX_THREADS:-unset}
67+
- RAILS_MIN_THREADS: ${RAILS_MIN_THREADS:-unset}
68+
- TOOLS: ${TOOLS:-unset}
69+
"
70+
5971
TIMEOUT_SEC=60
6072
START=$(date +%s)
6173
until curl -fsS "$TARGET" >/dev/null; do

0 commit comments

Comments
 (0)