9:33 a.m.
We use a custom sh plugin to test retries are working.
---
tests/Makefile.am | 4 ++
tests/test-retry.sh | 89 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1b1e05b..8bbd03b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -114,6 +114,7 @@ EXTRA_DIST = \
test-reflection-address.sh \
test-reflection-base64.sh \
test-reflection-raw.sh \
+ test-retry.sh \
test-shutdown.sh \
test-ssh.sh \
test.tcl \
@@ -1040,6 +1041,9 @@ test_readahead_SOURCES = test-readahead.c test.h
test_readahead_CFLAGS = $(WARNINGS_CFLAGS) $(LIBGUESTFS_CFLAGS)
test_readahead_LDADD = libtest.la $(LIBGUESTFS_LIBS)
+# retry filter test.
+TESTS += test-retry.sh
+
# truncate filter tests.
TESTS += \
test-truncate1.sh \
diff --git a/tests/test-retry.sh b/tests/test-retry.sh
new file mode 100755
index 0000000..3a2f79f
--- /dev/null
+++ b/tests/test-retry.sh
@@ -0,0 +1,89 @@
+#!/usr/bin/env bash
+# nbdkit
+# Copyright (C) 2018-2019 Red Hat Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# * Neither the name of Red Hat nor the names of its contributors may be
+# used to endorse or promote products derived from this software without
+# specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY RED HAT AND CONTRIBUTORS ''AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL RED HAT OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+
+source ./functions.sh
+set -e
+set -x
+
+requires qemu-img --version
+requires stat --version
+
+files="retry.img retry-start retry-count retry-open-count"
+rm -f $files
+cleanup_fn rm -f $files
+
+touch retry-start
+
+# Create a custom plugin which will test retrying.
+nbdkit -v -U - --filter=retry \
+ sh - \
+ --run 'qemu-img convert $nbd retry.img' <<'EOF'
+case "$1" in
+ open)
+ # Count how many times the connection is (re-)opened.
+ i=`cat retry-open-count`
+ echo $((i+1)) > retry-open-count
+ ;;
+ pread)
+ # Fail 3 times then succeed, and count how long it takes.
+ i=`cat retry-count`
+ ((i++))
+ echo $i > retry-count
+ if [ $i -le 3 ]; then
+ echo "EIO pread failed" >&2
+ exit 1
+ else
+ dd if=/dev/zero count=$3 iflag=count_bytes
+ fi
+ ;;
+
+ get_size) echo 512 ;;
+ *) exit 2 ;;
+esac
+EOF
+
+# The 3 failures should take 2, 4 and 8 seconds (minimum 14 seconds in
+# total).
+start_t=`stat -c '%Z' retry-start`
+end_t=`date +'%s'`
+if [ $((end_t - start_t)) -lt 14 ]; then
+ echo "$0: test ran too quickly"
+ exit 1
+fi
+
+# Check the handle was opened 4 times (first open + one reopen for
+# each retry).
+retry_open_count=`cat retry-open-count`
+if [ $retry_open_count -ne 4 ]; then
+ echo "$0: retry-open-count ($retry_open_count) != 5"
+ exit 1
+fi
--
2.23.0