ordinals
], [ignore], [test ! -e pid || kill `cat pid`])
AT_CHECK(
- [[test-jsonrpc request unix:socket get_schema [\"nonexistent\"]]], [0],
+ [[ovstest test-jsonrpc request unix:socket get_schema [\"nonexistent\"]]], [0],
[[{"error":null,"id":0,"result":{"details":"get_schema request specifies unknown database nonexistent","error":"unknown database","syntax":"[\"nonexistent\"]"}}
]], [], [test ! -e pid || kill `cat pid`])
OVSDB_SERVER_SHUTDOWN
AT_CHECK([ovsdb-client list-tables unix:socket ordinals], [0], [ignore], [ignore])
# Add an already added database.
-AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db2], 2, [], [stderr])
-AT_CHECK([sed 's/(.*)/(...)/' stderr], [0],
- [I/O error: db2: failed to lock lockfile (...)
+AT_CHECK([ovs-appctl -t ovsdb-server ovsdb-server/add-db db2], 2, [],
+ [db2: already open
ovs-appctl: ovsdb-server: server returned an error
])
done]],
[0], [stdout], [ignore], [test ! -e pid || kill `cat pid`])
dnl Check that all the crap is in fact in the database log.
-AT_CHECK([[${PERL} $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | test-json --multiple -]], [0],
+AT_CHECK([[${PERL} $srcdir/uuidfilt.pl db | grep -v ^OVSDB | sed 's/"_date":[0-9]*/"_date":0/' | ovstest test-json --multiple -]], [0],
[[{"cksum":"12345678 9","name":"ordinals","tables":{"ordinals":{"columns":{"name":{"type":"string"},"number":{"type":"integer"}},"indexes":[["number"]]}},"version":"5.1.3"}
{"_comment":"add row for zero 0","_date":0,"ordinals":{"<0>":{"name":"zero"}}}
{"_comment":"delete row for 0","_date":0,"ordinals":{"<0>":null}}
OVSDB_SERVER_SHUTDOWN
AT_CLEANUP
-AT_SETUP([ovsdb-server connection queue limits])
+AT_SETUP([ovsdb-server combines updates on backlogged connections])
OVS_LOGDIR=`pwd`; export OVS_LOGDIR
OVS_RUNDIR=`pwd`; export OVS_RUNDIR
ON_EXIT([kill `cat *.pid`])
# Linux
rmem_max=`cat /proc/sys/net/core/rmem_max`
elif rmem_max=`sysctl -n net.inet.tcp.recvbuf_max 2>/dev/null`; then
- : # FreeBSD
+ : # FreeBSD, NetBSD
else
# Don't know how to get maximum socket receive buffer on this OS
AT_SKIP_IF([:])
fi
-# Calculate the total amount of data we need to queue: rmem_max in the
-# kernel plus 1024 kB in jsonrpc-server sending userspace (see default
-# backlog_threshold in ovsdb_jsonrpc_session_create() in
-# jsonrpc-server.c).
-queue_size=`expr $rmem_max + 1024 \* 1024`
-echo rmem_max=$rmem_max queue_size=$queue_size
-
-# Each flow update message takes up at least 48 bytes of space in queues
-# and in practice more than that.
-n_msgs=`expr $queue_size / 48`
-echo n_msgs=$n_msgs
+
+# Calculate the number of iterations we need to queue. Each of the
+# iterations we execute, by itself, yields a monitor update of about
+# 25 kB, so fill up that much space plus a few for luck.
+n_iterations=`expr $rmem_max / 25000 + 5`
+echo rmem_max=$rmem_max n_iterations=$n_iterations
+
+# If there's too much queuing skip the test to avoid timing out.
+AT_SKIP_IF([test $rmem_max -gt 1048576])
+
+# Calculate the exact number of monitor updates expected for $n_iterations,
+# assuming no updates are combined. The "extra" update is for the initial
+# contents of the database.
+n_updates=`expr $n_iterations \* 3 + 1`
# Start an ovsdb-server with the vswitchd schema.
OVSDB_INIT([db])
-AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:socket db],
+AT_CHECK([ovsdb-server --detach --no-chdir --pidfile --log-file --remote=punix:db.sock db],
[0], [ignore], [ignore])
-# Executes a pair of transactions that add a bridge with 100 ports,
-# and then deletes that bridge. Each of these transactions yields
-# a monitor update about 25 kB in size.
+# Executes a set of transactions that add a bridge with 100 ports, and
+# then deletes that bridge. This yields three monitor updates that
+# add up to about 25 kB in size.
+#
+# The update also increments a counter held in the database so that we can
+# verify that the overall effect of the transactions took effect (e.g.
+# monitor updates at the end weren't just dropped). We add an arbitrary
+# string to the counter to make grepping for it more reliable.
+counter=0
trigger_big_update () {
- ovs-vsctl --db=unix:socket --no-wait -- add-br br0 $add
- ovs-vsctl --db=unix:socket --no-wait -- del-br br0
+ counter=`expr $counter + 1`
+ ovs-vsctl --no-wait -- set open_vswitch . system_version=xyzzy$counter
+ ovs-vsctl --no-wait -- add-br br0 $add
+ ovs-vsctl --no-wait -- del-br br0
}
add_ports () {
for j in `seq 1 100`; do
}
add=`add_ports`
-AT_CAPTURE_FILE([ovsdb-client.out])
AT_CAPTURE_FILE([ovsdb-client.err])
# Start an ovsdb-client monitoring all changes to the database,
# make it block to force the buffers to fill up, and then execute
-# enough transactions that ovsdb-server disconnects it.
-AT_CHECK([ovsdb-client --detach --no-chdir --pidfile monitor unix:socket ALL >ovsdb-client.out 2>ovsdb-client.err])
+# enough iterations that ovsdb-server starts combining updates.
+AT_CHECK([ovsdb-client --detach --no-chdir --pidfile monitor ALL >ovsdb-client.out 2>ovsdb-client.err])
AT_CHECK([ovs-appctl -t ovsdb-client ovsdb-client/block])
-for i in `seq 1 100`; do
- echo "blocked update ($i of 100)"
- trigger_big_update
+for i in `seq 1 $n_iterations`; do
+ echo "blocked update ($i of $n_iterations)"
+ trigger_big_update $i
done
AT_CHECK([ovs-appctl -t ovsdb-client ovsdb-client/unblock])
-
-# Make sure that ovsdb-server disconnected the client and
-# that the client exited as a result.
-if grep "bytes backlogged but a complete replica would only take [[0-9]]* bytes, disconnecting" ovsdb-server.log; then
- :
-else
- AT_FAIL_IF([:])
-fi
+OVS_WAIT_UNTIL([grep "\"xyzzy$counter\"" ovsdb-client.out])
+AT_CHECK([ovs-appctl -t ovsdb-client exit])
OVS_WAIT_WHILE([test -e ovsdb-client.pid])
-# Start an ovsdb-client monitoring all changes to the database,
-# without making it block, and then execute the same transactions that
-# we did before. This time the client should not get disconnected.
-AT_CHECK([ovsdb-client --detach --no-chdir --pidfile monitor unix:socket ALL >ovsdb-client.out 2>ovsdb-client.err])
-for i in `seq 1 100`; do
- echo "unblocked update ($i of 100)"
- trigger_big_update
-
- # Make sure that ovsdb-client gets enough CPU time to process the updates.
- ovs-appctl -t ovsdb-client version > /dev/null
-done
+# Count the number of updates in the ovsdb-client output, by counting
+# the number of changes to the Open_vSwitch table. (All of our
+# transactions modify the Open_vSwitch table.) It should be less than
+# $n_updates updates.
+#
+# Check that the counter is what we expect.
+logged_updates=`grep -c '^Open_vSwitch' ovsdb-client.out`
+echo "logged_updates=$logged_updates (expected less than $n_updates)"
+AT_CHECK([test $logged_updates -lt $n_updates])
+AT_CHECK_UNQUOTED([ovs-vsctl get open_vswitch . system_version], [0],
+ ["xyzzy$counter"
+])
AT_CLEANUP
\f
AT_BANNER([OVSDB -- ovsdb-server transactions (SSL IPv4 sockets)])
git://git.onelab.eu / sliver-openvswitch.git / blobdiff