Commit fb165ad9 authored by Kirill Smelkov's avatar Kirill Smelkov

X neotest: Also benchmark NEO/py with logging disabled

NEO/py currently logs every packet internally in RAM buffer to flush on
SIGRTMIN if such a request comes. This might be adding overhead, so
Julien asked to also have numbers for NEO/py server with logging
disabled.

We already don't enable logging on NEO/py client since to enable it a
?logfile query needs to be passed to ZODB URL and we don't do so
anywhere.
parent f81284ac
...@@ -226,11 +226,18 @@ kill $j' EXIT ...@@ -226,11 +226,18 @@ kill $j' EXIT
# ---- start NEO/ZEO nodes ---- # ---- start NEO/ZEO nodes ----
# neopy_log logname - `--logfile ...` argument for logging from a NEO/py node
# empty if $X_NEOPY_LOG_SKIP set
neopy_log() {
test -z "$X_NEOPY_LOG_SKIP" || return
echo --logfile=$log/$1.log
}
# M{py,go} ... - spawn master # M{py,go} ... - spawn master
Mpy() { Mpy() {
# --autostart=1 # --autostart=1
exec -a Mpy \ exec -a Mpy \
neomaster --cluster=$neocluster --bind=$Mbind --masters=$Mbind -r 1 -p 1 --logfile=$log/Mpy.log "$@" & neomaster --cluster=$neocluster --bind=$Mbind --masters=$Mbind -r 1 -p 1 `neopy_log Mpy` "$@" &
} }
Mgo() { Mgo() {
...@@ -244,7 +251,7 @@ Spy() { ...@@ -244,7 +251,7 @@ Spy() {
# --database=... # --database=...
# --engine=... # --engine=...
exec -a Spy \ exec -a Spy \
neostorage --cluster=$neocluster --bind=$Sbind --masters=$Mbind --logfile=$log/Spy.log "$@" & neostorage --cluster=$neocluster --bind=$Sbind --masters=$Mbind `neopy_log Spy` "$@" &
} }
# Sgo <data.fs> - spawn NEO/go storage # Sgo <data.fs> - spawn NEO/go storage
...@@ -259,7 +266,7 @@ Sgo() { ...@@ -259,7 +266,7 @@ Sgo() {
# Apy ... - spawn NEO/py admin # Apy ... - spawn NEO/py admin
Apy() { Apy() {
exec -a Apy \ exec -a Apy \
neoadmin --cluster=$neocluster --bind=$Abind --masters=$Mbind --logfile=$log/Apy.log "$@" & neoadmin --cluster=$neocluster --bind=$Abind --masters=$Mbind `neopy_log Apy` "$@" &
} }
# Zpy <data.fs> ... - spawn ZEO # Zpy <data.fs> ... - spawn ZEO
...@@ -946,6 +953,13 @@ zbench_local() { ...@@ -946,6 +953,13 @@ zbench_local() {
xneoctl set cluster stopping xneoctl set cluster stopping
wait wait
# XXX JM asked to also have NEO/py with logging disabled
echo -e "\n*** NEO/py sqlite (logging disabled)"
X_NEOPY_LOG_SKIP=y NEOpylite
zbench neo://$neocluster@$Mbind "`hostname`/neo/py(!log)/sqlite" $zhashok
xneoctl set cluster stopping
wait
echo -e "\n*** NEO/py sql" echo -e "\n*** NEO/py sql"
NEOpysql NEOpysql
zbench neo://$neocluster@$Mbind `hostname`/neo/py/sql $zhashok zbench neo://$neocluster@$Mbind `hostname`/neo/py/sql $zhashok
...@@ -953,6 +967,14 @@ zbench_local() { ...@@ -953,6 +967,14 @@ zbench_local() {
xmysql -e "SHUTDOWN" xmysql -e "SHUTDOWN"
wait wait
# XXX JM asked to also have NEO/py with logging disabled
echo -e "\n*** NEO/py sql (logging disabled)"
X_NEOPY_LOG_SKIP=y NEOpysql
zbench neo://$neocluster@$Mbind "`hostname`/neo/py(!log)/sql" $zhashok
xneoctl set cluster stopping
xmysql -e "SHUTDOWN"
wait
echo -e "\n*** NEO/go" echo -e "\n*** NEO/go"
NEOgo NEOgo
zbench neo://$neocluster@$Mbind `hostname`/neo/go $zhashok zbench neo://$neocluster@$Mbind `hostname`/neo/go $zhashok
...@@ -1095,7 +1117,14 @@ zbench_cluster() { ...@@ -1095,7 +1117,14 @@ zbench_cluster() {
echo -e "\n*** NEO/py sqlite" echo -e "\n*** NEO/py sqlite"
NEOpylite NEOpylite
on $url ./neotest run-client neo://$neocluster@$Mbind" `hostname`-$peer/neo/py/sqlite" $zhashok on $url ./neotest run-client neo://$neocluster@$Mbind "`hostname`-$peer/neo/py/sqlite" $zhashok
xneoctl set cluster stopping
wait
# XXX JM asked to also have NEO/py with logging disabled
echo -e "\n*** NEO/py sqlite (logging disabled)"
X_NEOPY_LOG_SKIP=y NEOpylite
on $url ./neotest run-client neo://$neocluster@$Mbind "\\\"`hostname`-$peer/neo/py(!log)/sqlite\\\"" $zhashok
xneoctl set cluster stopping xneoctl set cluster stopping
wait wait
...@@ -1106,6 +1135,14 @@ zbench_cluster() { ...@@ -1106,6 +1135,14 @@ zbench_cluster() {
xmysql -e "SHUTDOWN" xmysql -e "SHUTDOWN"
wait wait
# XXX JM asked to also have NEO/py with logging disabled
echo -e "\n*** NEO/py sql (logging disabled)"
X_NEOPY_LOG_SKIP=y NEOpysql
on $url ./neotest run-client neo://$neocluster@$Mbind "\\\"`hostname`-$peer/neo/py(!log)/sql\\\"" $zhashok
xneoctl set cluster stopping
xmysql -e "SHUTDOWN"
wait
echo -e "\n*** NEO/go" echo -e "\n*** NEO/go"
NEOgo NEOgo
on $url ./neotest run-client neo://$neocluster@$Mbind "`hostname`-$peer/neo/go" $zhashok on $url ./neotest run-client neo://$neocluster@$Mbind "`hostname`-$peer/neo/go" $zhashok
......
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