Fix wrk commands (#3522)

toolset/setup/docker/wrk/concurrency.sh

@@ -4,19 +4,19 @@ let max_threads=$(cat /proc/cpuinfo | grep processor | wc -l)
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Primer $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d 5 -c 8 --timeout 8 -t 8 \"$url\""
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d 5 -c 8 --timeout 8 -t 8 $url"
 echo "---------------------------------------------------------"
 echo ""
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d 5 -c 8 --timeout 8 -t 8 $url
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d 5 -c 8 --timeout 8 -t 8 $url
 sleep 5
 
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Warmup $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads \"$url\""
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads \"$url\""
 echo "---------------------------------------------------------"
 echo ""
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads $url
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads $url
 sleep 5
 
 for c in $levels
@@ -24,11 +24,11 @@ do
 echo ""
 echo "---------------------------------------------------------"
 echo " Concurrency: $c for $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d %duration -c $c --timeout 8 -t $(($c>$max_threads?$max_threads:$c)) \"$url\""
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $c --timeout 8 -t $(($c>$max_threads?$max_threads:$c)) \"$url\""
 echo "---------------------------------------------------------"
 echo ""
 STARTTIME=$(date +"%s")
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url
 echo "STARTTIME $STARTTIME"
 echo "ENDTIME $(date +"%s")"
 sleep 2

toolset/setup/docker/wrk/pipeline.sh

@@ -4,19 +4,19 @@ let max_threads=$(cat /proc/cpuinfo | grep processor | wc -l)
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Primer $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d 5 -c 8 --timeout 8 -t 8 $url"
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d 5 -c 8 --timeout 8 -t 8 $url"
 echo "---------------------------------------------------------"
 echo ""
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d 5 -c 8 --timeout 8 -t 8 $url
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d 5 -c 8 --timeout 8 -t 8 $url
 sleep 5
 
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Warmup $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads $url"
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads $url"
 echo "---------------------------------------------------------"
 echo ""
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads $url
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads $url
 sleep 5
 
 for c in $levels
@@ -24,11 +24,11 @@ do
 echo ""
 echo "---------------------------------------------------------"
 echo " Concurrency: $c for $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d $duration -c $c --timeout 8 -t $(($c>$max_threads?$max_threads:$c)) $url -s /pipeline.lua -- $pipeline"
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $c --timeout 8 -t $(($c>$max_threads?$max_threads:$c)) $url -s /pipeline.lua -- $pipeline"
 echo "---------------------------------------------------------"
 echo ""
 STARTTIME=$(date +"%s")
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url -s /pipeline.lua -- $pipeline
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $c --timeout 8 -t "$(($c>$max_threads?$max_threads:$c))" $url -s /pipeline.lua -- $pipeline
 echo "STARTTIME $STARTTIME"
 echo "ENDTIME $(date +"%s")"
 sleep 2

toolset/setup/docker/wrk/query.sh

@@ -4,19 +4,19 @@ let max_threads=$(cat /proc/cpuinfo | grep processor | wc -l)
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Primer $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d 5 -c 8 --timeout 8 -t 8 \"${url}2\""
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d 5 -c 8 --timeout 8 -t 8 \"${url}2\""
 echo "---------------------------------------------------------"
 echo ""
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d 5 -c 8 --timeout 8 -t 8 "${url}2"
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d 5 -c 8 --timeout 8 -t 8 "${url}2"
 sleep 5
 
 echo ""
 echo "---------------------------------------------------------"
 echo " Running Warmup $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads \"${url}2\""
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads \"${url}2\""
 echo "---------------------------------------------------------"
 echo ""
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads "${url}2"
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads "${url}2"
 sleep 5
 
 for c in $levels
@@ -24,11 +24,11 @@ do
 echo ""
 echo "---------------------------------------------------------"
 echo " Queries: $c for $name"
-echo " wrk \"-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'\" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads \"$url$c\""
+echo " wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads \"$url$c\""
 echo "---------------------------------------------------------"
 echo ""
 STARTTIME=$(date +"%s")
-wrk "-H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive'" --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads "$url$c"
+wrk -H 'Host: $server_host' -H 'Accept: $accept' -H 'Connection: keep-alive' --latency -d $duration -c $max_concurrency --timeout 8 -t $max_threads "$url$c"
 echo "STARTTIME $STARTTIME"
 echo "ENDTIME $(date +"%s")"
 sleep 2