diff options
author | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-09 13:57:03 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@yahoo-inc.com> | 2017-06-09 13:57:03 +0000 |
commit | 415e0c386a72efca3a0a5d1c3418e5d929ed7ab8 (patch) | |
tree | c79e0bef7b21160c180c87d72c7d243ee9fe3ff2 /fbench/util | |
parent | 8cec7dcc18f268a647cfb5958f62dda864adba1f (diff) |
Rename fbench programs to have vespa- prefix.
Temporarily add symlinks from old name to new name.
Diffstat (limited to 'fbench/util')
-rwxr-xr-x | fbench/util/fbench-formatter.py | 2 | ||||
-rwxr-xr-x | fbench/util/runtests.sh | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/fbench/util/fbench-formatter.py b/fbench/util/fbench-formatter.py index 3c7eeca2bb1..75ec43fe7b0 100755 --- a/fbench/util/fbench-formatter.py +++ b/fbench/util/fbench-formatter.py @@ -1,6 +1,6 @@ #!/usr/bin/python # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -"""Usage: read.py [options] [fbench output file] +"""Usage: read.py [options] [vespa-fbench output file] Will read from stdin if no file name is given diff --git a/fbench/util/runtests.sh b/fbench/util/runtests.sh index 58b72ae1f86..cc921d96742 100755 --- a/fbench/util/runtests.sh +++ b/fbench/util/runtests.sh @@ -17,13 +17,13 @@ done shift $(($OPTIND - 1)) if [ $# -lt 8 ] || [ "$opt_error" = "true" ]; then echo "usage: runtests.sh [-o] [-l] <minClients> <maxClients> <deltaClients>" - echo " <minCycle> <maxCycle> <deltaCycle> [fbench options] <hostname> <port>" + echo " <minCycle> <maxCycle> <deltaCycle> [vespa-fbench options] <hostname> <port>" echo "" echo "The number of clients varies from <minClients> to <maxClients> with" echo "<deltaClients> increments. For each client count, the cycle time will" echo "vary in the same way according to <minCycle>, <maxCycle> and <deltaCycle>." - echo "fbench is run with each combination of client count and cycle time, and" - echo "the result output is filtered with the 'resultfilter.pl' script." + echo "vespa-fbench is run with each combination of client count and cycle time, and" + echo "the result output is filtered with the 'vespa-resultfilter.pl' script." echo "If you want to save the results you should redirect stdout to a file." echo "" echo " -o : change the order in which the tests are performed so that client" @@ -33,12 +33,12 @@ if [ $# -lt 8 ] || [ "$opt_error" = "true" ]; then echo " If -o was specified this will output blank lines between test series" echo " using different cycle time." echo "" - echo "[fbench options] <hostname> <port>: These arguments are passed to fbench." + echo "[vespa-fbench options] <hostname> <port>: These arguments are passed to vespa-fbench." echo " There are 2 things to remenber: first; do not specify either of the -n" echo " or -c options since they will override the values for client count and" echo " cycle time generated by this script. secondly; make sure you specify" - echo " the correct host and port number. See the fbench usage (run fbench" - echo " without parameters) for more info on how to invoke fbench." + echo " the correct host and port number. See the vespa-fbench usage (run vespa-fbench" + echo " without parameters) for more info on how to invoke vespa-fbench." exit 1 fi @@ -59,7 +59,7 @@ if [ ! $deltaCycle -gt 0 ]; then exit 1 fi -echo "# fbench results collected by 'runtests.sh'." +echo "# vespa-fbench results collected by 'runtests.sh'." echo "#" echo "#1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20" echo "#clients duration cycle lowlimit skip fail ok overtime min max avg 25% 50% 75% 90% 95% 99% rate util zerohit" @@ -71,7 +71,7 @@ if [ "$opt_o" = "true" ]; then clients=$minClients while [ ! $clients -gt $maxClients ]; do test -f pretest.sh && ./pretest.sh > /dev/null 2>&1 - fbench -n $clients -c $cycle $@ | resultfilter.pl + vespa-fbench -n $clients -c $cycle $@ | vespa-resultfilter.pl clients=$(($clients + $deltaClients)) done [ "$opt_l" = "true" ] && echo "" @@ -83,7 +83,7 @@ else cycle=$minCycle while [ ! $cycle -gt $maxCycle ]; do test -f pretest.sh && ./pretest.sh > /dev/null 2>&1 - fbench -n $clients -c $cycle $@ | resultfilter.pl + vespa-fbench -n $clients -c $cycle $@ | vespa-resultfilter.pl cycle=$(($cycle + $deltaCycle)) done [ "$opt_l" = "true" ] && echo "" |