From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIEyE-00073W-Sl for qemu-devel@nongnu.org; Tue, 25 Feb 2014 05:10:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WIEy9-00073t-Ls for qemu-devel@nongnu.org; Tue, 25 Feb 2014 05:10:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:32975) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WIEy9-00073n-Ed for qemu-devel@nongnu.org; Tue, 25 Feb 2014 05:10:33 -0500 From: Stefan Hajnoczi Date: Tue, 25 Feb 2014 11:09:58 +0100 Message-Id: <1393322998-10289-4-git-send-email-stefanha@redhat.com> In-Reply-To: <1393322998-10289-1-git-send-email-stefanha@redhat.com> References: <1393322998-10289-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 3/3] qemu-iotests: add 080 NBD client disconnect tests List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Paolo Bonzini , bluewindow@h3c.com, nick@bytemark.co.uk This new test case uses nbd-fault-injector.py to simulate broken TCP connections at each stage in the NBD protocol. This way we can exercise block/nbd-client.c's socket error handling code paths. In particular, this serves as a regression test to make sure nbd-client.c doesn't cause an infinite loop by leaving its nbd_receive_reply() fd handler registered after the connection has been closed. This bug was fixed in an earlier patch. Signed-off-by: Stefan Hajnoczi --- tests/qemu-iotests/080 | 91 ++++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/080.out | 73 +++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 165 insertions(+) create mode 100755 tests/qemu-iotests/080 create mode 100644 tests/qemu-iotests/080.out diff --git a/tests/qemu-iotests/080 b/tests/qemu-iotests/080 new file mode 100755 index 0000000..21f599b --- /dev/null +++ b/tests/qemu-iotests/080 @@ -0,0 +1,91 @@ +#!/bin/bash +# +# Test NBD client unexpected disconnect +# +# Copyright Red Hat, Inc. 2014 +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +# creator +owner=stefanha@redhat.com + +seq=`basename $0` +echo "QA output created by $seq" + +here=`pwd` +tmp=/tmp/$$ +status=1 # failure is the default! + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter + +_supported_fmt generic +_supported_proto nbd +_supported_os Linux + +# Pick a TCP port based on our pid. This way multiple instances of this test +# can run in parallel without conflicting. +choose_tcp_port() { + echo $((($$ % 31744) + 1024)) # 1024 <= port < 32768 +} + +wait_for_tcp_port() { + while ! (netstat --tcp --listening --numeric | \ + grep "$1.*0.0.0.0:\*.*LISTEN") 2>&1 >/dev/null; do + sleep 0.1 + done +} + +filter_nbd() { + # nbd.c error messages contain function names and line numbers that are prone + # to change. Message ordering depends on timing between send and receive + # callbacks sometimes, making them unreliable. + # + # Filter out the TCP port number since this changes between runs. + sed -e 's#^nbd.c:.*##g' \ + -e 's#nbd:127.0.0.1:[^:]*:#nbd:127.0.0.1:PORT:#g' +} + +check_disconnect() { + event=$1 + when=$2 + echo "=== Check disconnect $when $event ===" + echo + + port=$(choose_tcp_port) + + cat > "$TEST_DIR/nbd-fault-injector.conf" <&1 >/dev/null & + wait_for_tcp_port "127.0.0.1:$port" + $QEMU_IO -c "read 0 512" "nbd:127.0.0.1:$port:exportname=foo" 2>&1 | _filter_qemu_io | filter_nbd + + echo +} + +for event in neg1 "export" neg2 request reply data; do + for when in before after; do + check_disconnect "$event" "$when" + done +done + +# success, all done +echo "*** done" +rm -f $seq.full +status=0 diff --git a/tests/qemu-iotests/080.out b/tests/qemu-iotests/080.out new file mode 100644 index 0000000..9fc5761 --- /dev/null +++ b/tests/qemu-iotests/080.out @@ -0,0 +1,73 @@ +QA output created by 080 +=== Check disconnect before neg1 === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument +no file open, try 'help open' + +=== Check disconnect after neg1 === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument +no file open, try 'help open' + +=== Check disconnect before export === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument +no file open, try 'help open' + +=== Check disconnect after export === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument +no file open, try 'help open' + +=== Check disconnect before neg2 === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not open image: Invalid argument +no file open, try 'help open' + +=== Check disconnect after neg2 === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error +no file open, try 'help open' + +=== Check disconnect before request === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error +no file open, try 'help open' + +=== Check disconnect after request === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error +no file open, try 'help open' + +=== Check disconnect before reply === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error +no file open, try 'help open' + +=== Check disconnect after reply === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error +no file open, try 'help open' + +=== Check disconnect before data === + + +qemu-io: can't open device nbd:127.0.0.1:PORT:exportname=foo: Could not read image for determining its format: Input/output error +no file open, try 'help open' + +=== Check disconnect after data === + + +read failed: Input/output error + +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index d8be74a..2c2a3f3 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -83,3 +83,4 @@ 074 rw auto 077 rw auto 079 rw auto +080 rw auto -- 1.8.5.3