Skip to contentSkip to conversation

iotests: Emit signal-kill messages

PATCH Superseded Max Reitz 4 participants 13 messages Aug 31, 2015 – Oct 29, 2015

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Max Reitz

author
#0 lore raw

cover iotests: Emit signal-kill messages

Currently, if a qemu-related command (qemu, qemu-io, qemu-img, qemu-nbd) is invoked in an iotest, receives a signal and is subsequently killed (e.g. a segmentation fault), this is not logged in the test output. The first patch in this series makes the bash tests no longer suppress that line, and the second patch adds a similar notification for the python tests.

Max Reitz (2):
iotests: Do not suppress segfaults in bash tests
iotests: Warn if python subprocess is killed

 tests/qemu-iotests/039           | 19 ++++++-------------
 tests/qemu-iotests/039.out       |  6 +++---
 tests/qemu-iotests/061           |  6 ++++--
 tests/qemu-iotests/061.out       |  2 ++
 tests/qemu-iotests/check         |  8 ++++----
 tests/qemu-iotests/common.config | 34 ++++++++++++++++++++++++++++++----
 tests/qemu-iotests/common.rc     | 12 +++++++++++-
 tests/qemu-iotests/iotests.py    | 32 ++++++++++++++++++++++++--------
 8 files changed, 84 insertions(+), 35 deletions(-)
Signature · 1 line
2.5.0
author
#1 lore raw

PATCH 1/2 iotests: Do not suppress segfaults in bash tests

Currently, if a qemu/qemu-io/qemu-img/qemu-nbd invocation receives a segmentation fault, that message is invisible in most cases since the output is generally filtered and bash suppresses the segmentation fault notice for any but the last element of a pipe.

Most of the time, the test will then fail anyway because of missing output, but not necessarily (as happened with test 82 recently).

Fix this by making the corresponding environment variables point to wrapper functions which execute the respective command in a subshell.

---
 tests/qemu-iotests/039           | 19 ++++++-------------
 tests/qemu-iotests/039.out       |  6 +++---
 tests/qemu-iotests/061           |  6 ++++--
 tests/qemu-iotests/061.out       |  2 ++
 tests/qemu-iotests/check         |  8 ++++----
 tests/qemu-iotests/common.config | 34 ++++++++++++++++++++++++++++++----
 tests/qemu-iotests/common.rc     | 12 +++++++++++-
 tests/qemu-iotests/iotests.py    |  6 +++---
 8 files changed, 63 insertions(+), 30 deletions(-)
tests/qemu-iotests/039 +6 -13
index 859705f..617f397 100755
@@ -47,13 +47,6 @@ _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough"
 
-_subshell_exec()
-{
-    # Executing crashing commands in a subshell prevents information like the
-    # "Killed" line from being lost
-    (exec "$@")
-}
-
 size=128M
 
 echo
@@ -74,8 +67,8 @@ echo "== Creating a dirty image file =="
 IMGOPTS="compat=1.1,lazy_refcounts=on"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must be set
@@ -109,8 +102,8 @@ echo "== Opening a dirty image read/write should repair it =="
 IMGOPTS="compat=1.1,lazy_refcounts=on"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must be set
@@ -127,8 +120,8 @@ echo "== Creating an image file with lazy_refcounts=off =="
 IMGOPTS="compat=1.1,lazy_refcounts=off"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must not be set since lazy_refcounts=off
tests/qemu-iotests/039.out +3 -3
index d09751f..613ef1b 100644
@@ -11,7 +11,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x1
 ERROR cluster 5 refcount=0 reference=1
 ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
@@ -46,7 +46,7 @@ read 512/512 bytes at offset 0
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x1
 ERROR cluster 5 refcount=0 reference=1
 Rebuilding refcount structure
@@ -60,7 +60,7 @@ incompatible_features     0x0
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x0
 No errors were found on the image.
 
tests/qemu-iotests/061 +4 -2
index 8d37f8a..1df887a 100755
@@ -58,7 +58,8 @@ echo
 echo "=== Testing dirty version downgrade ==="
 echo
 IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" 2>&1 \
+    | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 $PYTHON qcow2.py "$TEST_IMG" dump-header
@@ -91,7 +92,8 @@ echo
 echo "=== Testing dirty lazy_refcounts=off ==="
 echo
 IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" 2>&1 \
+    | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "lazy_refcounts=off" "$TEST_IMG"
 $PYTHON qcow2.py "$TEST_IMG" dump-header
tests/qemu-iotests/061.out +2 -0
index 5ec248f..c9e3917 100644
@@ -57,6 +57,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+./common.config: Aborted                 (core dumped) ( exec $QEMU_IO_CMD "$@" )
 magic                     0x514649fb
 version                   3
 backing_file_offset       0x0
@@ -214,6 +215,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+./common.config: Aborted                 (core dumped) ( exec $QEMU_IO_CMD "$@" )
 magic                     0x514649fb
 version                   3
 backing_file_offset       0x0
tests/qemu-iotests/check +4 -4
index 6d58203..b5a535e 100755
@@ -231,10 +231,10 @@ FULL_HOST_DETAILS=`_full_platform_details`
 #FULL_MOUNT_OPTIONS=`_scratch_mount_options`
 
 cat <<EOF
-QEMU          -- $QEMU
-QEMU_IMG      -- $QEMU_IMG
-QEMU_IO       -- $QEMU_IO
-QEMU_NBD      -- $QEMU_NBD
+QEMU          -- $QEMU_CMD
+QEMU_IMG      -- $QEMU_IMG_CMD
+QEMU_IO       -- $QEMU_IO_CMD
+QEMU_NBD      -- $QEMU_NBD_CMD
 IMGFMT        -- $FULL_IMGFMT_DETAILS
 IMGPROTO      -- $FULL_IMGPROTO_DETAILS
 PLATFORM      -- $FULL_HOST_DETAILS
tests/qemu-iotests/common.config +30 -4
index e0bf896..480efe6 100644
@@ -103,10 +103,36 @@ if [ -z "$QEMU_NBD_PROG" ]; then
     export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
 fi
 
-export QEMU="$QEMU_PROG $QEMU_OPTIONS"
-export QEMU_IMG=$QEMU_IMG_PROG
-export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
-export QEMU_NBD=$QEMU_NBD_PROG
+export QEMU_CMD="$QEMU_PROG $QEMU_OPTIONS"
+export QEMU_IMG_CMD=$QEMU_IMG_PROG
+export QEMU_IO_CMD="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
+export QEMU_NBD_CMD=$QEMU_NBD_PROG
+
+_qemu_wrapper()
+{
+    (exec $QEMU_CMD "$@")
+}
+
+_qemu_img_wrapper()
+{
+    (exec $QEMU_IMG_CMD "$@")
+}
+
+_qemu_io_wrapper()
+{
+    (exec $QEMU_IO_CMD "$@")
+}
+
+_qemu_nbd_wrapper()
+{
+    (exec $QEMU_NBD_CMD "$@")
+}
+
+export QEMU=_qemu_wrapper
+export QEMU_IMG=_qemu_img_wrapper
+export QEMU_IO=_qemu_io_wrapper
+export QEMU_NBD=_qemu_nbd_wrapper
+
 default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}')
 default_alias_machine=$($QEMU -machine \? |\
     awk -v var_default_machine="$default_machine"\)\
tests/qemu-iotests/common.rc +11 -1
index 22d3514..28e4bea 100644
@@ -439,7 +439,17 @@ _unsupported_imgopts()
 #
 _require_command()
 {
-    eval c=\$$1
+    if [ "$1" = "QEMU" ]; then
+        c=$QEMU_PROG
+    elif [ "$1" = "QEMU_IMG" ]; then
+        c=$QEMU_IMG_PROG
+    elif [ "$1" = "QEMU_IO" ]; then
+        c=$QEMU_IO_PROG
+    elif [ "$1" = "QEMU_NBD" ]; then
+        c=$QEMU_NBD_PROG
+    else
+        eval c=\$$1
+    fi
     [ -x "$c" ] || _notrun "$1 utility required, skipped this test"
 }
 
tests/qemu-iotests/iotests.py +3 -3
index 5579253..927c74a 100644
@@ -33,9 +33,9 @@ __all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io',
 
 # This will not work if arguments or path contain spaces but is necessary if we
 # want to support the override options that ./check supports.
-qemu_img_args = os.environ.get('QEMU_IMG', 'qemu-img').strip().split(' ')
-qemu_io_args = os.environ.get('QEMU_IO', 'qemu-io').strip().split(' ')
-qemu_args = os.environ.get('QEMU', 'qemu').strip().split(' ')
+qemu_img_args = os.environ.get('QEMU_IMG_CMD', 'qemu-img').strip().split(' ')
+qemu_io_args = os.environ.get('QEMU_IO_CMD', 'qemu-io').strip().split(' ')
+qemu_args = os.environ.get('QEMU_CMD', 'qemu').strip().split(' ')
 
 imgfmt = os.environ.get('IMGFMT', 'raw')
 imgproto = os.environ.get('IMGPROTO', 'file')
Signature · 1 line
2.5.0
#2 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 1/2] iotests: Do not suppress segfaults in bash tests

Quoted 12 lines · Max Reitz

Currently, if a qemu/qemu-io/qemu-img/qemu-nbd invocation receives a segmentation fault, that message is invisible in most cases since the output is generally filtered and bash suppresses the segmentation fault notice for any but the last element of a pipe.

Most of the time, the test will then fail anyway because of missing output, but not necessarily (as happened with test 82 recently).

Fix this by making the corresponding environment variables point to wrapper functions which execute the respective command in a subshell.

Quoted 11 lines
---
 tests/qemu-iotests/039           | 19 ++++++-------------
 tests/qemu-iotests/039.out       |  6 +++---
 tests/qemu-iotests/061           |  6 ++++--
 tests/qemu-iotests/061.out       |  2 ++
 tests/qemu-iotests/check         |  8 ++++----
 tests/qemu-iotests/common.config | 34 ++++++++++++++++++++++++++++++----
 tests/qemu-iotests/common.rc     | 12 +++++++++++-
 tests/qemu-iotests/iotests.py    |  6 +++---
 8 files changed, 63 insertions(+), 30 deletions(-)

Test 082 fails now:

Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2, -o help TEST_DIR/t.qcow2
qemu-img: Invalid option list: backing_file=TEST_DIR/t.qcow2,
+./common.config: line 117: 737 Segmentation fault (core dumped) ( exec $QEMU_IMG_CMD "$@" )

Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,help TEST_DIR/t.qcow2
qemu-img: Invalid option list: ,help
+./common.config: line 117: 746 Segmentation fault (core dumped) ( exec $QEMU_IMG_CMD "$@" )

Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DIR/t.qcow2
qemu-img: Invalid option list: ,,
+./common.config: line 117: 756 Segmentation fault (core dumped) ( exec $QEMU_IMG_CMD "$@" )

Testing: amend -f qcow2 -o help
Supported options

That shows me your patches are working well :)

Quoted 152 lines
tests/qemu-iotests/039 +6 -13
index 859705f..617f397 100755
@@ -47,13 +47,6 @@ _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough"
 
-_subshell_exec()
-{
-    # Executing crashing commands in a subshell prevents information like the
-    # "Killed" line from being lost
-    (exec "$@")
-}
-
 size=128M
 
 echo
@@ -74,8 +67,8 @@ echo "== Creating a dirty image file =="
 IMGOPTS="compat=1.1,lazy_refcounts=on"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must be set
@@ -109,8 +102,8 @@ echo "== Opening a dirty image read/write should repair it =="
 IMGOPTS="compat=1.1,lazy_refcounts=on"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must be set
@@ -127,8 +120,8 @@ echo "== Creating an image file with lazy_refcounts=off =="
 IMGOPTS="compat=1.1,lazy_refcounts=off"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must not be set since lazy_refcounts=off
tests/qemu-iotests/039.out +3 -3
index d09751f..613ef1b 100644
@@ -11,7 +11,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x1
 ERROR cluster 5 refcount=0 reference=1
 ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
@@ -46,7 +46,7 @@ read 512/512 bytes at offset 0
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x1
 ERROR cluster 5 refcount=0 reference=1
 Rebuilding refcount structure
@@ -60,7 +60,7 @@ incompatible_features     0x0
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x0
 No errors were found on the image.
 
tests/qemu-iotests/061 +4 -2
index 8d37f8a..1df887a 100755
@@ -58,7 +58,8 @@ echo
 echo "=== Testing dirty version downgrade ==="
 echo
 IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" 2>&1 \
+    | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 $PYTHON qcow2.py "$TEST_IMG" dump-header
@@ -91,7 +92,8 @@ echo
 echo "=== Testing dirty lazy_refcounts=off ==="
 echo
 IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" 2>&1 \
+    | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "lazy_refcounts=off" "$TEST_IMG"
 $PYTHON qcow2.py "$TEST_IMG" dump-header
tests/qemu-iotests/061.out +2 -0
index 5ec248f..c9e3917 100644
@@ -57,6 +57,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+./common.config: Aborted                 (core dumped) ( exec $QEMU_IO_CMD "$@" )
 magic                     0x514649fb
 version                   3
 backing_file_offset       0x0
@@ -214,6 +215,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+./common.config: Aborted                 (core dumped) ( exec $QEMU_IO_CMD "$@" )
 magic                     0x514649fb
 version                   3
 backing_file_offset       0x0
tests/qemu-iotests/check +4 -4
index 6d58203..b5a535e 100755
@@ -231,10 +231,10 @@ FULL_HOST_DETAILS=`_full_platform_details`
 #FULL_MOUNT_OPTIONS=`_scratch_mount_options`
 
 cat <<EOF
-QEMU          -- $QEMU
-QEMU_IMG      -- $QEMU_IMG
-QEMU_IO       -- $QEMU_IO
-QEMU_NBD      -- $QEMU_NBD
+QEMU          -- $QEMU_CMD
+QEMU_IMG      -- $QEMU_IMG_CMD
+QEMU_IO       -- $QEMU_IO_CMD
+QEMU_NBD      -- $QEMU_NBD_CMD
 IMGFMT        -- $FULL_IMGFMT_DETAILS
 IMGPROTO      -- $FULL_IMGPROTO_DETAILS
 PLATFORM      -- $FULL_HOST_DETAILS
tests/qemu-iotests/common.config +0 -0
index e0bf896..480efe6 100644
@@ -103,10 +103,36 @@ if [ -z "$QEMU_NBD_PROG" ]; then
     export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
 fi

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 110

Quoted 10 lines
tests/qemu-iotests/common.config +5 -4
 
-export QEMU="$QEMU_PROG $QEMU_OPTIONS"
-export QEMU_IMG=$QEMU_IMG_PROG
-export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
-export QEMU_NBD=$QEMU_NBD_PROG
+export QEMU_CMD="$QEMU_PROG $QEMU_OPTIONS"
+export QEMU_IMG_CMD=$QEMU_IMG_PROG
+export QEMU_IO_CMD="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
+export QEMU_NBD_CMD=$QEMU_NBD_PROG
+

Unfortunately, these exports (old and new) make it so that pathnames with spaces won't work (in case someone hasn't had it beaten into them that spaced pathnames is begging for trouble...). But luckily, I think your patch make it easier to fix this, since you have the wrapper!

I think we want to drop the _OPTIONS in each of the exports, e.g.:

-export QEMU="$QEMU_PROG $QEMU_OPTIONS"
+export QEMU_CMD="$QEMU_PROG"

And then instead of this:

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 115

Quoted 5 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_wrapper()
+{
+    (exec $QEMU_CMD "$@")
+}
+

Use this form, instead:

+_qemu_wrapper()
+{
+ (exec "$QEMU_CMD" "$QEMU_OPTIONS" "$@")
+}
+

Quoted 5 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_img_wrapper()
+{
+    (exec $QEMU_IMG_CMD "$@")
+}
+

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 130

Quoted 10 lines
tests/qemu-iotests/common.config +10 -0
+_qemu_io_wrapper()
+{
+    (exec $QEMU_IO_CMD "$@")
+}
+
+_qemu_nbd_wrapper()
+{
+    (exec $QEMU_NBD_CMD "$@")
+}
+

Repeat as appropriate, above.

Quoted 52 lines
tests/qemu-iotests/common.config +5 -0
+export QEMU=_qemu_wrapper
+export QEMU_IMG=_qemu_img_wrapper
+export QEMU_IO=_qemu_io_wrapper
+export QEMU_NBD=_qemu_nbd_wrapper
+
 default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}')
 default_alias_machine=$($QEMU -machine \? |\
     awk -v var_default_machine="$default_machine"\)\
tests/qemu-iotests/common.rc +11 -1
index 22d3514..28e4bea 100644
@@ -439,7 +439,17 @@ _unsupported_imgopts()
 #
 _require_command()
 {
-    eval c=\$$1
+    if [ "$1" = "QEMU" ]; then
+        c=$QEMU_PROG
+    elif [ "$1" = "QEMU_IMG" ]; then
+        c=$QEMU_IMG_PROG
+    elif [ "$1" = "QEMU_IO" ]; then
+        c=$QEMU_IO_PROG
+    elif [ "$1" = "QEMU_NBD" ]; then
+        c=$QEMU_NBD_PROG
+    else
+        eval c=\$$1
+    fi
     [ -x "$c" ] || _notrun "$1 utility required, skipped this test"
 }
 
tests/qemu-iotests/iotests.py +3 -3
index 5579253..927c74a 100644
@@ -33,9 +33,9 @@ __all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io',
 
 # This will not work if arguments or path contain spaces but is necessary if we
 # want to support the override options that ./check supports.
-qemu_img_args = os.environ.get('QEMU_IMG', 'qemu-img').strip().split(' ')
-qemu_io_args = os.environ.get('QEMU_IO', 'qemu-io').strip().split(' ')
-qemu_args = os.environ.get('QEMU', 'qemu').strip().split(' ')
+qemu_img_args = os.environ.get('QEMU_IMG_CMD', 'qemu-img').strip().split(' ')
+qemu_io_args = os.environ.get('QEMU_IO_CMD', 'qemu-io').strip().split(' ')
+qemu_args = os.environ.get('QEMU_CMD', 'qemu').strip().split(' ')
 
 imgfmt = os.environ.get('IMGFMT', 'raw')
 imgproto = os.environ.get('IMGPROTO', 'file')
Signature · 1 line
2.5.0
author
#3 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 1/2] iotests: Do not suppress segfaults in bash tests

Quoted 39 lines · Jeff Cody
Quoted 12 lines · Max Reitz

Currently, if a qemu/qemu-io/qemu-img/qemu-nbd invocation receives a segmentation fault, that message is invisible in most cases since the output is generally filtered and bash suppresses the segmentation fault notice for any but the last element of a pipe.

Most of the time, the test will then fail anyway because of missing output, but not necessarily (as happened with test 82 recently).

Fix this by making the corresponding environment variables point to wrapper functions which execute the respective command in a subshell.

Quoted 11 lines
---
 tests/qemu-iotests/039           | 19 ++++++-------------
 tests/qemu-iotests/039.out       |  6 +++---
 tests/qemu-iotests/061           |  6 ++++--
 tests/qemu-iotests/061.out       |  2 ++
 tests/qemu-iotests/check         |  8 ++++----
 tests/qemu-iotests/common.config | 34 ++++++++++++++++++++++++++++++----
 tests/qemu-iotests/common.rc     | 12 +++++++++++-
 tests/qemu-iotests/iotests.py    |  6 +++---
 8 files changed, 63 insertions(+), 30 deletions(-)

Test 082 fails now:

Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2, -o help TEST_DIR/t.qcow2
qemu-img: Invalid option list: backing_file=TEST_DIR/t.qcow2,
+./common.config: line 117: 737 Segmentation fault (core dumped) ( exec $QEMU_IMG_CMD "$@" )

Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,help TEST_DIR/t.qcow2
qemu-img: Invalid option list: ,help
+./common.config: line 117: 746 Segmentation fault (core dumped) ( exec $QEMU_IMG_CMD "$@" )

Testing: amend -f qcow2 -o backing_file=TEST_DIR/t.qcow2 -o ,, -o help TEST_DIR/t.qcow2
qemu-img: Invalid option list: ,,
+./common.config: line 117: 756 Segmentation fault (core dumped) ( exec $QEMU_IMG_CMD "$@" )

Quoted 5 lines

Testing: amend -f qcow2 -o help
Supported options

That shows me your patches are working well :)

Yes, as intended. :-)

fyi, the patch fixing this is
http://lists.nongnu.org/archive/html/qemu-block/2015-08/msg00156.html.

Quoted 184 lines
Quoted 152 lines
tests/qemu-iotests/039 +6 -13
index 859705f..617f397 100755
@@ -47,13 +47,6 @@ _supported_os Linux
 _default_cache_mode "writethrough"
 _supported_cache_modes "writethrough"
 
-_subshell_exec()
-{
-    # Executing crashing commands in a subshell prevents information like the
-    # "Killed" line from being lost
-    (exec "$@")
-}
-
 size=128M
 
 echo
@@ -74,8 +67,8 @@ echo "== Creating a dirty image file =="
 IMGOPTS="compat=1.1,lazy_refcounts=on"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must be set
@@ -109,8 +102,8 @@ echo "== Opening a dirty image read/write should repair it =="
 IMGOPTS="compat=1.1,lazy_refcounts=on"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must be set
@@ -127,8 +120,8 @@ echo "== Creating an image file with lazy_refcounts=off =="
 IMGOPTS="compat=1.1,lazy_refcounts=off"
 _make_test_img $size
 
-_subshell_exec $QEMU_IO -c "write -P 0x5a 0 512" \
-                        -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
+$QEMU_IO -c "write -P 0x5a 0 512" \
+         -c "sigraise $(kill -l KILL)" "$TEST_IMG" 2>&1 \
     | _filter_qemu_io
 
 # The dirty bit must not be set since lazy_refcounts=off
tests/qemu-iotests/039.out +3 -3
index d09751f..613ef1b 100644
@@ -11,7 +11,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x1
 ERROR cluster 5 refcount=0 reference=1
 ERROR OFLAG_COPIED data cluster: l2_entry=8000000000050000 refcount=0
@@ -46,7 +46,7 @@ read 512/512 bytes at offset 0
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x1
 ERROR cluster 5 refcount=0 reference=1
 Rebuilding refcount structure
@@ -60,7 +60,7 @@ incompatible_features     0x0
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=134217728
 wrote 512/512 bytes at offset 0
 512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
-./039: Killed                  ( exec "$@" )
+./common.config: Killed                  ( exec $QEMU_IO_CMD "$@" )
 incompatible_features     0x0
 No errors were found on the image.
 
tests/qemu-iotests/061 +4 -2
index 8d37f8a..1df887a 100755
@@ -58,7 +58,8 @@ echo
 echo "=== Testing dirty version downgrade ==="
 echo
 IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" 2>&1 \
+    | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "compat=0.10" "$TEST_IMG"
 $PYTHON qcow2.py "$TEST_IMG" dump-header
@@ -91,7 +92,8 @@ echo
 echo "=== Testing dirty lazy_refcounts=off ==="
 echo
 IMGOPTS="compat=1.1,lazy_refcounts=on" _make_test_img 64M
-$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" | _filter_qemu_io
+$QEMU_IO -c "write -P 0x2a 0 128k" -c flush -c abort "$TEST_IMG" 2>&1 \
+    | _filter_qemu_io
 $PYTHON qcow2.py "$TEST_IMG" dump-header
 $QEMU_IMG amend -o "lazy_refcounts=off" "$TEST_IMG"
 $PYTHON qcow2.py "$TEST_IMG" dump-header
tests/qemu-iotests/061.out +2 -0
index 5ec248f..c9e3917 100644
@@ -57,6 +57,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+./common.config: Aborted                 (core dumped) ( exec $QEMU_IO_CMD "$@" )
 magic                     0x514649fb
 version                   3
 backing_file_offset       0x0
@@ -214,6 +215,7 @@ No errors were found on the image.
 Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
 wrote 131072/131072 bytes at offset 0
 128 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
+./common.config: Aborted                 (core dumped) ( exec $QEMU_IO_CMD "$@" )
 magic                     0x514649fb
 version                   3
 backing_file_offset       0x0
tests/qemu-iotests/check +4 -4
index 6d58203..b5a535e 100755
@@ -231,10 +231,10 @@ FULL_HOST_DETAILS=`_full_platform_details`
 #FULL_MOUNT_OPTIONS=`_scratch_mount_options`
 
 cat <<EOF
-QEMU          -- $QEMU
-QEMU_IMG      -- $QEMU_IMG
-QEMU_IO       -- $QEMU_IO
-QEMU_NBD      -- $QEMU_NBD
+QEMU          -- $QEMU_CMD
+QEMU_IMG      -- $QEMU_IMG_CMD
+QEMU_IO       -- $QEMU_IO_CMD
+QEMU_NBD      -- $QEMU_NBD_CMD
 IMGFMT        -- $FULL_IMGFMT_DETAILS
 IMGPROTO      -- $FULL_IMGPROTO_DETAILS
 PLATFORM      -- $FULL_HOST_DETAILS
tests/qemu-iotests/common.config +0 -0
index e0bf896..480efe6 100644
@@ -103,10 +103,36 @@ if [ -z "$QEMU_NBD_PROG" ]; then
     export QEMU_NBD_PROG="`set_prog_path qemu-nbd`"
 fi

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 110

Quoted 10 lines
tests/qemu-iotests/common.config +5 -4
 
-export QEMU="$QEMU_PROG $QEMU_OPTIONS"
-export QEMU_IMG=$QEMU_IMG_PROG
-export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
-export QEMU_NBD=$QEMU_NBD_PROG
+export QEMU_CMD="$QEMU_PROG $QEMU_OPTIONS"
+export QEMU_IMG_CMD=$QEMU_IMG_PROG
+export QEMU_IO_CMD="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
+export QEMU_NBD_CMD=$QEMU_NBD_PROG
+

Unfortunately, these exports (old and new) make it so that pathnames with spaces won't work (in case someone hasn't had it beaten into them that spaced pathnames is begging for trouble...). But luckily, I think your patch make it easier to fix this, since you have the wrapper!

I think we want to drop the _OPTIONS in each of the exports, e.g.:

(quoted diff) +1 -1
-export QEMU="$QEMU_PROG $QEMU_OPTIONS"
+export QEMU_CMD="$QEMU_PROG"

And then instead of this:

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 115

Quoted 5 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_wrapper()
+{
+    (exec $QEMU_CMD "$@")
+}
+

Use this form, instead:

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 115

Quoted 5 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_wrapper()
+{
+    (exec "$QEMU_CMD" "$QEMU_OPTIONS" "$@")
+}
+

Yes, I tried not to break anything in that regard that wasn't already broken, but if we have the chance to fix something, then we (I) should go for it.

QEMU_CMD is used for the Python tests as the command line to be used for qemu invocation, so it cannot be modified like that. But what I can do is to drop QEMU.*_CMD and replace it by "$QEMU.*_PROG" "$QEMU.*_OPTIONS" everywhere, I guess. I'll have a look.

Thanks for reviewing!

Max

Quoted 70 lines
Quoted 5 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_img_wrapper()
+{
+    (exec $QEMU_IMG_CMD "$@")
+}
+

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 130

Quoted 10 lines
tests/qemu-iotests/common.config +10 -0
+_qemu_io_wrapper()
+{
+    (exec $QEMU_IO_CMD "$@")
+}
+
+_qemu_nbd_wrapper()
+{
+    (exec $QEMU_NBD_CMD "$@")
+}
+

Repeat as appropriate, above.

Quoted 52 lines
tests/qemu-iotests/common.config +5 -0
+export QEMU=_qemu_wrapper
+export QEMU_IMG=_qemu_img_wrapper
+export QEMU_IO=_qemu_io_wrapper
+export QEMU_NBD=_qemu_nbd_wrapper
+
 default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}')
 default_alias_machine=$($QEMU -machine \? |\
     awk -v var_default_machine="$default_machine"\)\
tests/qemu-iotests/common.rc +11 -1
index 22d3514..28e4bea 100644
@@ -439,7 +439,17 @@ _unsupported_imgopts()
 #
 _require_command()
 {
-    eval c=\$$1
+    if [ "$1" = "QEMU" ]; then
+        c=$QEMU_PROG
+    elif [ "$1" = "QEMU_IMG" ]; then
+        c=$QEMU_IMG_PROG
+    elif [ "$1" = "QEMU_IO" ]; then
+        c=$QEMU_IO_PROG
+    elif [ "$1" = "QEMU_NBD" ]; then
+        c=$QEMU_NBD_PROG
+    else
+        eval c=\$$1
+    fi
     [ -x "$c" ] || _notrun "$1 utility required, skipped this test"
 }
 
tests/qemu-iotests/iotests.py +3 -3
index 5579253..927c74a 100644
@@ -33,9 +33,9 @@ __all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io',
 
 # This will not work if arguments or path contain spaces but is necessary if we
 # want to support the override options that ./check supports.
-qemu_img_args = os.environ.get('QEMU_IMG', 'qemu-img').strip().split(' ')
-qemu_io_args = os.environ.get('QEMU_IO', 'qemu-io').strip().split(' ')
-qemu_args = os.environ.get('QEMU', 'qemu').strip().split(' ')
+qemu_img_args = os.environ.get('QEMU_IMG_CMD', 'qemu-img').strip().split(' ')
+qemu_io_args = os.environ.get('QEMU_IO_CMD', 'qemu-io').strip().split(' ')
+qemu_args = os.environ.get('QEMU_CMD', 'qemu').strip().split(' ')
 
 imgfmt = os.environ.get('IMGFMT', 'raw')
 imgproto = os.environ.get('IMGPROTO', 'file')
Signature · 1 line
2.5.0
Reviewed-by
#4 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 1/2] iotests: Do not suppress segfaults in bash tests

Quoted 25 lines · Max Reitz
Quoted 24 lines · Jeff Cody
Quoted 23 lines · Max Reitz

Currently, if a qemu/qemu-io/qemu-img/qemu-nbd invocation receives a segmentation fault, that message is invisible in most cases since the output is generally filtered and bash suppresses the segmentation fault notice for any but the last element of a pipe.

Most of the time, the test will then fail anyway because of missing output, but not necessarily (as happened with test 82 recently).

Fix this by making the corresponding environment variables point to wrapper functions which execute the respective command in a subshell.

---
 tests/qemu-iotests/039           | 19 ++++++-------------
 tests/qemu-iotests/039.out       |  6 +++---
 tests/qemu-iotests/061           |  6 ++++--
 tests/qemu-iotests/061.out       |  2 ++
 tests/qemu-iotests/check         |  8 ++++----
 tests/qemu-iotests/common.config | 34 ++++++++++++++++++++++++++++++----
 tests/qemu-iotests/common.rc     | 12 +++++++++++-
 tests/qemu-iotests/iotests.py    |  6 +++---
 8 files changed, 63 insertions(+), 30 deletions(-)

[snip]

Quoted 42 lines
Quoted 32 lines

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 110

Quoted 10 lines
tests/qemu-iotests/common.config +5 -4
-export QEMU="$QEMU_PROG $QEMU_OPTIONS"
-export QEMU_IMG=$QEMU_IMG_PROG
-export QEMU_IO="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
-export QEMU_NBD=$QEMU_NBD_PROG
+export QEMU_CMD="$QEMU_PROG $QEMU_OPTIONS"
+export QEMU_IMG_CMD=$QEMU_IMG_PROG
+export QEMU_IO_CMD="$QEMU_IO_PROG $QEMU_IO_OPTIONS"
+export QEMU_NBD_CMD=$QEMU_NBD_PROG
+

Unfortunately, these exports (old and new) make it so that pathnames with spaces won't work (in case someone hasn't had it beaten into them that spaced pathnames is begging for trouble...). But luckily, I think your patch make it easier to fix this, since you have the wrapper!

I think we want to drop the _OPTIONS in each of the exports, e.g.:

(quoted diff) +1 -1
-export QEMU="$QEMU_PROG $QEMU_OPTIONS"
+export QEMU_CMD="$QEMU_PROG"

And then instead of this:

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 115

Quoted 5 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_wrapper()
+{
+    (exec $QEMU_CMD "$@")
+}
+

Use this form, instead:

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 115

Quoted 5 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_wrapper()
+{
+    (exec "$QEMU_CMD" "$QEMU_OPTIONS" "$@")
+}
+

Yes, I tried not to break anything in that regard that wasn't already broken, but if we have the chance to fix something, then we (I) should go for it.

Quoted 5 lines

QEMU_CMD is used for the Python tests as the command line to be used for qemu invocation, so it cannot be modified like that. But what I can do is to drop QEMU.*_CMD and replace it by "$QEMU.*_PROG" "$QEMU.*_OPTIONS" everywhere, I guess. I'll have a look.

Good point.

I don't think it needs to be done in this patch series, as your patches don't change this behavior. It could be done in a follow-up series, by you or someone else.

I'm happy to give my r-b as-is, and we can change it later.:

Quoted 3 lines

Thanks for reviewing!

Max

You're welcome :)

Quoted 73 lines
Quoted 71 lines
Quoted 6 lines
tests/qemu-iotests/common.config +5 -0
+_qemu_img_wrapper()
+{
+    (exec $QEMU_IMG_CMD "$@")
+}
+

tests/qemu-iotests/common.config if [ -z "$QEMU_NBD_PROG" ]; then · line 130

Quoted 10 lines
tests/qemu-iotests/common.config +10 -0
+_qemu_io_wrapper()
+{
+    (exec $QEMU_IO_CMD "$@")
+}
+
+_qemu_nbd_wrapper()
+{
+    (exec $QEMU_NBD_CMD "$@")
+}
+

Repeat as appropriate, above.

Quoted 52 lines
tests/qemu-iotests/common.config +5 -0
+export QEMU=_qemu_wrapper
+export QEMU_IMG=_qemu_img_wrapper
+export QEMU_IO=_qemu_io_wrapper
+export QEMU_NBD=_qemu_nbd_wrapper
+
 default_machine=$($QEMU -machine \? | awk '/(default)/{print $1}')
 default_alias_machine=$($QEMU -machine \? |\
     awk -v var_default_machine="$default_machine"\)\
tests/qemu-iotests/common.rc +11 -1
index 22d3514..28e4bea 100644
@@ -439,7 +439,17 @@ _unsupported_imgopts()
 #
 _require_command()
 {
-    eval c=\$$1
+    if [ "$1" = "QEMU" ]; then
+        c=$QEMU_PROG
+    elif [ "$1" = "QEMU_IMG" ]; then
+        c=$QEMU_IMG_PROG
+    elif [ "$1" = "QEMU_IO" ]; then
+        c=$QEMU_IO_PROG
+    elif [ "$1" = "QEMU_NBD" ]; then
+        c=$QEMU_NBD_PROG
+    else
+        eval c=\$$1
+    fi
     [ -x "$c" ] || _notrun "$1 utility required, skipped this test"
 }
 
tests/qemu-iotests/iotests.py +3 -3
index 5579253..927c74a 100644
@@ -33,9 +33,9 @@ __all__ = ['imgfmt', 'imgproto', 'test_dir' 'qemu_img', 'qemu_io',
 
 # This will not work if arguments or path contain spaces but is necessary if we
 # want to support the override options that ./check supports.
-qemu_img_args = os.environ.get('QEMU_IMG', 'qemu-img').strip().split(' ')
-qemu_io_args = os.environ.get('QEMU_IO', 'qemu-io').strip().split(' ')
-qemu_args = os.environ.get('QEMU', 'qemu').strip().split(' ')
+qemu_img_args = os.environ.get('QEMU_IMG_CMD', 'qemu-img').strip().split(' ')
+qemu_io_args = os.environ.get('QEMU_IO_CMD', 'qemu-io').strip().split(' ')
+qemu_args = os.environ.get('QEMU_CMD', 'qemu').strip().split(' ')
 
 imgfmt = os.environ.get('IMGFMT', 'raw')
 imgproto = os.environ.get('IMGPROTO', 'file')
Signature · 1 line
2.5.0
#5 lore raw

Re: [Qemu-devel] [PATCH 1/2] iotests: Do not suppress segfaults in bash tests

In reply to Max Reitz

Am 31.08.2015 um 21:05 hat Max Reitz geschrieben:

Quoted 5 lines

Currently, if a qemu/qemu-io/qemu-img/qemu-nbd invocation receives a segmentation fault, that message is invisible in most cases since the output is generally filtered and bash suppresses the segmentation fault notice for any but the last element of a pipe.

Quoted 7 lines

Most of the time, the test will then fail anyway because of missing output, but not necessarily (as happened with test 82 recently).

Fix this by making the corresponding environment variables point to wrapper functions which execute the respective command in a subshell.

This patch seems to have broken -valgrind.

Kevin

#6 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 1/2] iotests: Do not suppress segfaults in bash tests

Quoted 9 lines · Kevin Wolf

Am 31.08.2015 um 21:05 hat Max Reitz geschrieben:

Quoted 8 lines

Currently, if a qemu/qemu-io/qemu-img/qemu-nbd invocation receives a segmentation fault, that message is invisible in most cases since the output is generally filtered and bash suppresses the segmentation fault notice for any but the last element of a pipe.

Most of the time, the test will then fail anyway because of missing output, but not necessarily (as happened with test 82 recently).

Quoted 7 lines
Quoted 4 lines

Fix this by making the corresponding environment variables point to wrapper functions which execute the respective command in a subshell.

This patch seems to have broken -valgrind.

Hi Kevin,

I just submitted another patch to fix this issue ("qemu-iotests: fix -valgrind option for check")

Thanks,
Jeff

author
#7 lore raw

PATCH 2/2 iotests: Warn if python subprocess is killed

In reply to Max Reitz

Currently, if a subprocess of a python test (i.e. qemu-io, qemu-img, or qemu) receives a signal and is subsequently aborted, this is not logged.

This patch makes python tests always check the exit code of these subprocesses, and emit a message if they have been killed.

---
 tests/qemu-iotests/iotests.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
tests/qemu-iotests/iotests.py +21 -5
index 927c74a..d082597 100644
@@ -49,20 +49,34 @@ socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper')
 def qemu_img(*args):
     '''Run qemu-img and return the exit code'''
     devnull = open('/dev/null', 'r+')
-    return subprocess.call(qemu_img_args + list(args), stdin=devnull, stdout=devnull)
+    exitcode = subprocess.call(qemu_img_args + list(args), stdin=devnull, stdout=devnull)
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return exitcode
 
 def qemu_img_verbose(*args):
     '''Run qemu-img without suppressing its output and return the exit code'''
-    return subprocess.call(qemu_img_args + list(args))
+    exitcode = subprocess.call(qemu_img_args + list(args))
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return exitcode
 
 def qemu_img_pipe(*args):
     '''Run qemu-img and return its output'''
-    return subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE).communicate()[0]
+    subp = subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE)
+    exitcode = subp.wait()
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return subp.communicate()[0]
 
 def qemu_io(*args):
     '''Run qemu-io and return the stdout data'''
     args = qemu_io_args + list(args)
-    return subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0]
+    subp = subprocess.Popen(args, stdout=subprocess.PIPE)
+    exitcode = subp.wait()
+    if exitcode < 0:
+        sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' '.join(args)))
+    return subp.communicate()[0]
 
 def compare_images(img1, img2):
     '''Return True if two image files are identical'''
@@ -197,7 +211,9 @@ class VM(object):
         '''Terminate the VM and clean up'''
         if not self._popen is None:
             self._qmp.cmd('quit')
-            self._popen.wait()
+            exitcode = self._popen.wait()
+            if exitcode < 0:
+                sys.stderr.write('qemu received signal %i: %s\n' % (-exitcode, ' '.join(self._args)))
             os.remove(self._monitor_path)
             os.remove(self._qtest_path)
             os.remove(self._qemu_log_path)
Signature · 1 line
2.5.0
#8 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Warn if python subprocess is killed

Quoted 16 lines · Max Reitz

Currently, if a subprocess of a python test (i.e. qemu-io, qemu-img, or qemu) receives a signal and is subsequently aborted, this is not logged.

This patch makes python tests always check the exit code of these subprocesses, and emit a message if they have been killed.

---
 tests/qemu-iotests/iotests.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
tests/qemu-iotests/iotests.py +0 -0
index 927c74a..d082597 100644

tests/qemu-iotests/iotests.py socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') · line 56

Quoted 9 lines
tests/qemu-iotests/iotests.py +4 -1
@@ -49,20 +49,34 @@ socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper')
 def qemu_img(*args):
     '''Run qemu-img and return the exit code'''
     devnull = open('/dev/null', 'r+')
-    return subprocess.call(qemu_img_args + list(args), stdin=devnull, stdout=devnull)
+    exitcode = subprocess.call(qemu_img_args + list(args), stdin=devnull, stdout=devnull)
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return exitcode
 

Why tack on the arguments after the retcode for the print? The format makes it look like it should be a description for the signal received.

Quoted 41 lines
tests/qemu-iotests/iotests.py +17 -4
 def qemu_img_verbose(*args):
     '''Run qemu-img without suppressing its output and return the exit code'''
-    return subprocess.call(qemu_img_args + list(args))
+    exitcode = subprocess.call(qemu_img_args + list(args))
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return exitcode
 
 def qemu_img_pipe(*args):
     '''Run qemu-img and return its output'''
-    return subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE).communicate()[0]
+    subp = subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE)
+    exitcode = subp.wait()
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return subp.communicate()[0]
 
 def qemu_io(*args):
     '''Run qemu-io and return the stdout data'''
     args = qemu_io_args + list(args)
-    return subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0]
+    subp = subprocess.Popen(args, stdout=subprocess.PIPE)
+    exitcode = subp.wait()
+    if exitcode < 0:
+        sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' '.join(args)))
+    return subp.communicate()[0]
 
 def compare_images(img1, img2):
     '''Return True if two image files are identical'''
@@ -197,7 +211,9 @@ class VM(object):
         '''Terminate the VM and clean up'''
         if not self._popen is None:
             self._qmp.cmd('quit')
-            self._popen.wait()
+            exitcode = self._popen.wait()
+            if exitcode < 0:
+                sys.stderr.write('qemu received signal %i: %s\n' % (-exitcode, ' '.join(self._args)))
             os.remove(self._monitor_path)
             os.remove(self._qtest_path)
             os.remove(self._qemu_log_path)
author
#9 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Warn if python subprocess is killed

Quoted 23 lines · John Snow
Quoted 20 lines · Max Reitz

Currently, if a subprocess of a python test (i.e. qemu-io, qemu-img, or qemu) receives a signal and is subsequently aborted, this is not logged.

This patch makes python tests always check the exit code of these subprocesses, and emit a message if they have been killed.

---
 tests/qemu-iotests/iotests.py | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)
tests/qemu-iotests/iotests.py +0 -1
index 927c74a..d082597 100644
@@ -49,20 +49,34 @@ socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper')
 def qemu_img(*args):
     '''Run qemu-img and return the exit code'''
     devnull = open('/dev/null', 'r+')
-    return subprocess.call(qemu_img_args + list(args), stdin=devnull, stdout=devnull)
Quoted 8 lines

tests/qemu-iotests/iotests.py socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') · line 56

Quoted 5 lines
tests/qemu-iotests/iotests.py +4 -0
+    exitcode = subprocess.call(qemu_img_args + list(args), stdin=devnull, stdout=devnull)
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return exitcode
 

Why tack on the arguments after the retcode for the print? The format makes it look like it should be a description for the signal received.

qemu_img_args contains the qemu-img filename as well, so it should be obvious that that is the command line.

For the "why": I hope it will make debugging easier by providing the exact command line so you can reproduce the problem outside of the test.

Max

Quoted 42 lines
Quoted 42 lines
tests/qemu-iotests/iotests.py +17 -4
 def qemu_img_verbose(*args):
     '''Run qemu-img without suppressing its output and return the exit code'''
-    return subprocess.call(qemu_img_args + list(args))
+    exitcode = subprocess.call(qemu_img_args + list(args))
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return exitcode
 
 def qemu_img_pipe(*args):
     '''Run qemu-img and return its output'''
-    return subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE).communicate()[0]
+    subp = subprocess.Popen(qemu_img_args + list(args), stdout=subprocess.PIPE)
+    exitcode = subp.wait()
+    if exitcode < 0:
+        sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args))))
+    return subp.communicate()[0]
 
 def qemu_io(*args):
     '''Run qemu-io and return the stdout data'''
     args = qemu_io_args + list(args)
-    return subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0]
+    subp = subprocess.Popen(args, stdout=subprocess.PIPE)
+    exitcode = subp.wait()
+    if exitcode < 0:
+        sys.stderr.write('qemu-io received signal %i: %s\n' % (-exitcode, ' '.join(args)))
+    return subp.communicate()[0]
 
 def compare_images(img1, img2):
     '''Return True if two image files are identical'''
@@ -197,7 +211,9 @@ class VM(object):
         '''Terminate the VM and clean up'''
         if not self._popen is None:
             self._qmp.cmd('quit')
-            self._popen.wait()
+            exitcode = self._popen.wait()
+            if exitcode < 0:
+                sys.stderr.write('qemu received signal %i: %s\n' % (-exitcode, ' '.join(self._args)))
             os.remove(self._monitor_path)
             os.remove(self._qtest_path)
             os.remove(self._qemu_log_path)
Reviewed-by
#10 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Warn if python subprocess is killed

Quoted 36 lines · Max Reitz
Quoted 26 lines · John Snow
Quoted 23 lines · Max Reitz

Currently, if a subprocess of a python test (i.e. qemu-io, qemu-img, or qemu) receives a signal and is subsequently aborted, this is not logged.

This patch makes python tests always check the exit code of these subprocesses, and emit a message if they have been killed.

tests/qemu-iotests/iotests.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)

(quoted diff) +0 -0

b/tests/qemu-iotests/iotests.py index 927c74a..d082597 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -49,20 +49,34 @@ socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') def qemu_img(*args): '''Run qemu-img and return the exit code''' devnull = open('/dev/null', 'r+') - return subprocess.call(qemu_img_args + list(args),
stdin=devnull, stdout=devnull) + exitcode =
subprocess.call(qemu_img_args + list(args), stdin=devnull,
stdout=devnull) + if exitcode < 0: +

Quoted 8 lines
Quoted 4 lines

sys.stderr.write('qemu-img received signal %i: %s\n' %
(-exitcode, ' '.join(qemu_img_args + list(args)))) + return
exitcode

Why tack on the arguments after the retcode for the print? The format makes it look like it should be a description for the signal received.

Quoted 9 lines

qemu_img_args contains the qemu-img filename as well, so it should be obvious that that is the command line.

For the "why": I hope it will make debugging easier by providing the exact command line so you can reproduce the problem outside of the test.

Max

Sorry for being captain bikeshed: can this be something like:

"%s received signal %i; args: %s"

to avoid the string looking like it was meant to answer the question of what the signal was?
I won't insist on it, though:

Quoted 38 lines
Quoted 36 lines
Quoted 36 lines

def qemu_img_verbose(*args): '''Run qemu-img without
suppressing its output and return the exit code''' - return
subprocess.call(qemu_img_args + list(args)) + exitcode =
subprocess.call(qemu_img_args + list(args)) + if exitcode <
0: + sys.stderr.write('qemu-img received signal %i:
%s\n' % (-exitcode, ' '.join(qemu_img_args + list(args)))) + return exitcode

def qemu_img_pipe(*args): '''Run qemu-img and return its
output''' - return subprocess.Popen(qemu_img_args +
list(args), stdout=subprocess.PIPE).communicate()[0] + subp
= subprocess.Popen(qemu_img_args + list(args),
stdout=subprocess.PIPE) + exitcode = subp.wait() + if
exitcode < 0: + sys.stderr.write('qemu-img received
signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args +
list(args)))) + return subp.communicate()[0]

def qemu_io(*args): '''Run qemu-io and return the stdout
data''' args = qemu_io_args + list(args) - return
subprocess.Popen(args,
stdout=subprocess.PIPE).communicate()[0] + subp =
subprocess.Popen(args, stdout=subprocess.PIPE) + exitcode =
subp.wait() + if exitcode < 0: +
sys.stderr.write('qemu-io received signal %i: %s\n' %
(-exitcode, ' '.join(args))) + return subp.communicate()[0]

def compare_images(img1, img2): '''Return True if two image files are identical''' @@ -197,7 +211,9 @@ class VM(object):
'''Terminate the VM and clean up''' if not self._popen is
None: self._qmp.cmd('quit') - self._popen.wait() +
exitcode = self._popen.wait() + if exitcode < 0: +
sys.stderr.write('qemu received signal %i: %s\n' % (-exitcode, ' '.join(self._args))) os.remove(self._monitor_path) os.remove(self._qtest_path) os.remove(self._qemu_log_path)

author
#11 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Warn if python subprocess is killed

Quoted 51 lines · John Snow
Quoted 36 lines · Max Reitz
Quoted 26 lines · John Snow
Quoted 23 lines · Max Reitz

Currently, if a subprocess of a python test (i.e. qemu-io, qemu-img, or qemu) receives a signal and is subsequently aborted, this is not logged.

This patch makes python tests always check the exit code of these subprocesses, and emit a message if they have been killed.

tests/qemu-iotests/iotests.py | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)

(quoted diff) +0 -0

b/tests/qemu-iotests/iotests.py index 927c74a..d082597 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -49,20 +49,34 @@ socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') def qemu_img(*args): '''Run qemu-img and return the exit code''' devnull = open('/dev/null', 'r+') - return subprocess.call(qemu_img_args + list(args),
stdin=devnull, stdout=devnull) + exitcode =
subprocess.call(qemu_img_args + list(args), stdin=devnull,
stdout=devnull) + if exitcode < 0: +

Quoted 8 lines
Quoted 4 lines

sys.stderr.write('qemu-img received signal %i: %s\n' %
(-exitcode, ' '.join(qemu_img_args + list(args)))) + return
exitcode

Why tack on the arguments after the retcode for the print? The format makes it look like it should be a description for the signal received.

Quoted 9 lines

qemu_img_args contains the qemu-img filename as well, so it should be obvious that that is the command line.

For the "why": I hope it will make debugging easier by providing the exact command line so you can reproduce the problem outside of the test.

Max

Sorry for being captain bikeshed: can this be something like:

Quoted 7 lines

"%s received signal %i; args: %s"

to avoid the string looking like it was meant to answer the question of what the signal was?
I won't insist on it, though:

Well, feel free to fix it since it's already in master. :-)

(also, compare how bash does it:

Quoted 1 line

$FILE: line $LINE: $PID $SIGNAL_NAME (core dumped) ($ARGS)

)

Max

#12 lore raw

Re: [Qemu-devel] [Qemu-block] [PATCH 2/2] iotests: Warn if python subprocess is killed

Quoted 60 lines · Max Reitz
Quoted 50 lines · John Snow
Quoted 37 lines · Max Reitz
Quoted 27 lines · John Snow
Quoted 24 lines · Max Reitz

Currently, if a subprocess of a python test (i.e. qemu-io, qemu-img, or qemu) receives a signal and is subsequently aborted, this is not logged.

This patch makes python tests always check the exit code of these subprocesses, and emit a message if they have been killed.

tests/qemu-iotests/iotests.py | 26
+++++++++++++++++++++----- 1 file changed, 21
insertions(+), 5 deletions(-)

(quoted diff) +0 -0

b/tests/qemu-iotests/iotests.py index 927c74a..d082597 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -49,20 +49,34 @@ socket_scm_helper = os.environ.get('SOCKET_SCM_HELPER', 'socket_scm_helper') def qemu_img(*args): '''Run qemu-img and return the exit code''' devnull = open('/dev/null', 'r+') - return subprocess.call(qemu_img_args + list(args),
stdin=devnull, stdout=devnull) + exitcode =
subprocess.call(qemu_img_args + list(args), stdin=devnull,
stdout=devnull) + if exitcode < 0: +

Quoted 8 lines
Quoted 4 lines

sys.stderr.write('qemu-img received signal %i: %s\n' % (-exitcode, ' '.join(qemu_img_args + list(args)))) + return exitcode

Why tack on the arguments after the retcode for the print? The format makes it look like it should be a description for the signal received.

Quoted 9 lines

qemu_img_args contains the qemu-img filename as well, so it should be obvious that that is the command line.

For the "why": I hope it will make debugging easier by providing the exact command line so you can reproduce the problem outside of the test.

Max

Quoted 8 lines

Sorry for being captain bikeshed: can this be something like:

"%s received signal %i; args: %s"

to avoid the string looking like it was meant to answer the question of what the signal was? I won't insist on it, though:

Quoted 8 lines

Well, feel free to fix it since it's already in master. :-)

(also, compare how bash does it:

Quoted 1 line

$FILE: line $LINE: $PID $SIGNAL_NAME (core dumped) ($ARGS)

)

Max

ugh! pfeh! didn't see the v2, sorry. ignore this garbage.

--js