Commit 66c19305 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 5c75ca07
...@@ -424,7 +424,7 @@ lspci1() { ...@@ -424,7 +424,7 @@ lspci1() {
lspci -vmm -s $1 |grep "^$2:\\s*" |sed -e "s/^$2:\\s*//" lspci -vmm -s $1 |grep "^$2:\\s*" |sed -e "s/^$2:\\s*//"
} }
# show date/os/hardware/versions... # show information about local system (os, hardware, versions, ...)
system_info() { system_info() {
echo -n "# "; date --rfc-2822 echo -n "# "; date --rfc-2822
echo "# `whoami`@`hostname --fqdn` ($myaddr)"; echo "# `whoami`@`hostname --fqdn` ($myaddr)";
...@@ -823,6 +823,16 @@ cmd_bench-local() { ...@@ -823,6 +823,16 @@ cmd_bench-local() {
bench_cpu bench_cpu
bench_disk bench_disk
install_trap install_trap
zbench_local
# all ok
trap - EXIT
exit
}
# zodb part of cmd_bench-local
zbench_local() {
gen_data gen_data
zhashok=`cat $var/zhash.ok` zhashok=`cat $var/zhash.ok`
...@@ -860,10 +870,6 @@ cmd_bench-local() { ...@@ -860,10 +870,6 @@ cmd_bench-local() {
X_NEOGO_SHA1_SKIP=y zbench_go neo://$cluster@$Mbind "`hostname`/neo/go(!sha1)" $zhashok X_NEOGO_SHA1_SKIP=y zbench_go neo://$cluster@$Mbind "`hostname`/neo/go(!sha1)" $zhashok
xneoctl set cluster stopping xneoctl set cluster stopping
wait wait
# all ok
trap - EXIT
exit
} }
# command: benchmark when server runs locally and client is on another node # command: benchmark when server runs locally and client is on another node
...@@ -968,9 +974,20 @@ Benchmark$1-avg 1 \\2 ms/op\ ...@@ -968,9 +974,20 @@ Benchmark$1-avg 1 \\2 ms/op\
lat_tcp -S localhost lat_tcp -S localhost
done done
# zodb benchmarks
echo echo
install_trap install_trap
zbench_cluster
# all ok
trap - EXIT
exit
}
# zodb part of cmd_bench-cluster
zbench_cluster() {
gen_data gen_data
zhashok=`cat $var/zhash.ok` zhashok=`cat $var/zhash.ok`
...@@ -1005,10 +1022,6 @@ Benchmark$1-avg 1 \\2 ms/op\ ...@@ -1005,10 +1022,6 @@ Benchmark$1-avg 1 \\2 ms/op\
on $url X_NEOGO_SHA1_SKIP=y ./neotest run-client --goonly neo://$cluster@$Mbind "\\\"`hostname`-$peer/neo/go(!sha1)\\\"" $zhashok on $url X_NEOGO_SHA1_SKIP=y ./neotest run-client --goonly neo://$cluster@$Mbind "\\\"`hostname`-$peer/neo/go(!sha1)\\\"" $zhashok
xneoctl set cluster stopping xneoctl set cluster stopping
wait wait
# all ok
trap - EXIT
exit
} }
# command: run client workload against separate server # command: run client workload against separate server
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment