iotests: Launch qemu-nbd with -e 42
diff mbox

Message ID 20170426141407.10161-1-mreitz@redhat.com
State New
Headers show

Commit Message

Max Reitz April 26, 2017, 2:14 p.m. UTC
There is no reason for the qemu-nbd server used for tests not to accept
an arbitrary number of clients. In fact, test 181 will require it to
accept two clients at the same time (and thus it fails before this
patch).

This patch updates common.rc to launch qemu-nbd with -e 42 which should
be enough for all of our current and future tests.

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/common.rc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Eric Blake April 26, 2017, 2:18 p.m. UTC | #1
On 04/26/2017 09:14 AM, Max Reitz wrote:
> There is no reason for the qemu-nbd server used for tests not to accept
> an arbitrary number of clients. In fact, test 181 will require it to
> accept two clients at the same time (and thus it fails before this
> patch).
> 
> This patch updates common.rc to launch qemu-nbd with -e 42 which should
> be enough for all of our current and future tests.

Perfect place for you to inject some jibe about "life, the universe, and
everything" ;)

> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/common.rc | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)


> 
> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
> index 7d4781d4ad..31b888d4e9 100644
> --- a/tests/qemu-iotests/common.rc
> +++ b/tests/qemu-iotests/common.rc
> @@ -168,7 +168,9 @@ _make_test_img()
>  
>      # Start an NBD server on the image file, which is what we'll be talking to
>      if [ $IMGPROTO = "nbd" ]; then
> -        eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"
> +        # Pass a sufficiently high number to -e that should be enough for all
> +        # tests
> +        eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT -e 42  $TEST_IMG_FILE >/dev/null &"

Worth dropping the double-space before $TEST_IMG_FILE while touching this?

Reviewed-by: Eric Blake <eblake@redhat.com>
Max Reitz April 26, 2017, 2:20 p.m. UTC | #2
On 26.04.2017 16:18, Eric Blake wrote:
> On 04/26/2017 09:14 AM, Max Reitz wrote:
>> There is no reason for the qemu-nbd server used for tests not to accept
>> an arbitrary number of clients. In fact, test 181 will require it to
>> accept two clients at the same time (and thus it fails before this
>> patch).
>>
>> This patch updates common.rc to launch qemu-nbd with -e 42 which should
>> be enough for all of our current and future tests.
> 
> Perfect place for you to inject some jibe about "life, the universe, and
> everything" ;)

Everybody knows anyway. ;-)

>>
>> Signed-off-by: Max Reitz <mreitz@redhat.com>
>> ---
>>  tests/qemu-iotests/common.rc | 4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> 
>>
>> diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
>> index 7d4781d4ad..31b888d4e9 100644
>> --- a/tests/qemu-iotests/common.rc
>> +++ b/tests/qemu-iotests/common.rc
>> @@ -168,7 +168,9 @@ _make_test_img()
>>  
>>      # Start an NBD server on the image file, which is what we'll be talking to
>>      if [ $IMGPROTO = "nbd" ]; then
>> -        eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"
>> +        # Pass a sufficiently high number to -e that should be enough for all
>> +        # tests
>> +        eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT -e 42  $TEST_IMG_FILE >/dev/null &"
> 
> Worth dropping the double-space before $TEST_IMG_FILE while touching this?

I wasn't sure myself. It somehow is a nice separation between the option
arguments and the image file name so I thought that maybe it was
intended and was afraid to remove it... Well, and it doesn't really hurt.

Why don't we have CODING_STYLE for shell scripts? :-)

> Reviewed-by: Eric Blake <eblake@redhat.com>

Thanks!

Max
Kevin Wolf April 26, 2017, 3:23 p.m. UTC | #3
Am 26.04.2017 um 16:14 hat Max Reitz geschrieben:
> There is no reason for the qemu-nbd server used for tests not to accept
> an arbitrary number of clients. In fact, test 181 will require it to
> accept two clients at the same time (and thus it fails before this
> patch).
> 
> This patch updates common.rc to launch qemu-nbd with -e 42 which should
> be enough for all of our current and future tests.
> 
> Signed-off-by: Max Reitz <mreitz@redhat.com>

Thanks, applied to block-next.

Kevin

Patch
diff mbox

diff --git a/tests/qemu-iotests/common.rc b/tests/qemu-iotests/common.rc
index 7d4781d4ad..31b888d4e9 100644
--- a/tests/qemu-iotests/common.rc
+++ b/tests/qemu-iotests/common.rc
@@ -168,7 +168,9 @@  _make_test_img()
 
     # Start an NBD server on the image file, which is what we'll be talking to
     if [ $IMGPROTO = "nbd" ]; then
-        eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT  $TEST_IMG_FILE >/dev/null &"
+        # Pass a sufficiently high number to -e that should be enough for all
+        # tests
+        eval "$QEMU_NBD -v -t -b 127.0.0.1 -p 10810 -f $IMGFMT -e 42  $TEST_IMG_FILE >/dev/null &"
         sleep 1 # FIXME: qemu-nbd needs to be listening before we continue
     fi
 }