* [Qemu-devel] [PATCH v3 for-2.10] qemu-iotests: _cleanup_qemu must be called on exit
@ 2017-04-18 19:42 Jeff Cody
2017-04-20 15:09 ` Jeff Cody
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Cody @ 2017-04-18 19:42 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, kwolf, mreitz, eblake
For the tests that use the common.qemu functions for running a QEMU
process, _cleanup_qemu must be called in the exit function.
If it is not, if the qemu process aborts, then not all of the droppings
are cleaned up (e.g. pidfile, fifos).
This updates those tests that did not have a cleanup in qemu-iotests.
(I swapped spaces for tabs in test 102 as well)
Reported-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
---
v3 added test 156
v2 fixed typo in test 094, s/cleanup/_cleanup/ for the trap function. (Eric)
tests/qemu-iotests/028 | 1 +
tests/qemu-iotests/094 | 11 ++++++++---
tests/qemu-iotests/102 | 5 +++--
tests/qemu-iotests/109 | 1 +
tests/qemu-iotests/117 | 1 +
tests/qemu-iotests/130 | 1 +
tests/qemu-iotests/140 | 1 +
tests/qemu-iotests/141 | 1 +
tests/qemu-iotests/143 | 1 +
tests/qemu-iotests/156 | 1 +
10 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
index 7783e57..97a8869 100755
--- a/tests/qemu-iotests/028
+++ b/tests/qemu-iotests/028
@@ -32,6 +32,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
rm -f "${TEST_IMG}.copy"
_cleanup_test_img
}
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
index 0ba0b0c..9aa01e3 100755
--- a/tests/qemu-iotests/094
+++ b/tests/qemu-iotests/094
@@ -27,7 +27,14 @@ echo "QA output created by $seq"
here="$PWD"
status=1 # failure is the default!
-trap "exit \$status" 0 1 2 3 15
+_cleanup()
+{
+ _cleanup_qemu
+ _cleanup_test_img
+ rm -f "$TEST_DIR/source.$IMGFMT"
+}
+
+trap "_cleanup; exit \$status" 0 1 2 3 15
# get standard environment, filters and checks
. ./common.rc
@@ -73,8 +80,6 @@ _send_qemu_cmd $QEMU_HANDLE \
wait=1 _cleanup_qemu
-_cleanup_test_img
-rm -f "$TEST_DIR/source.$IMGFMT"
# success, all done
echo '*** done'
diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
index 64b4af9..87db1bb 100755
--- a/tests/qemu-iotests/102
+++ b/tests/qemu-iotests/102
@@ -25,11 +25,12 @@ seq=$(basename $0)
echo "QA output created by $seq"
here=$PWD
-status=1 # failure is the default!
+status=1 # failure is the default!
_cleanup()
{
- _cleanup_test_img
+ _cleanup_qemu
+ _cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
index 927151a..6161633 100755
--- a/tests/qemu-iotests/109
+++ b/tests/qemu-iotests/109
@@ -29,6 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
rm -f $TEST_IMG.src
_cleanup_test_img
}
diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
index e955d52..6c83461 100755
--- a/tests/qemu-iotests/117
+++ b/tests/qemu-iotests/117
@@ -29,6 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
index ecc8a5b..d4d148b 100755
--- a/tests/qemu-iotests/130
+++ b/tests/qemu-iotests/130
@@ -31,6 +31,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
_cleanup_test_img
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
index 49f9df4..8c80a5a 100755
--- a/tests/qemu-iotests/140
+++ b/tests/qemu-iotests/140
@@ -33,6 +33,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
_cleanup_test_img
rm -f "$TEST_DIR/nbd"
}
diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
index 27fb1cc..40a3405 100755
--- a/tests/qemu-iotests/141
+++ b/tests/qemu-iotests/141
@@ -29,6 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
_cleanup_test_img
rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
}
diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
index ec4ef22..5ff1944 100755
--- a/tests/qemu-iotests/143
+++ b/tests/qemu-iotests/143
@@ -29,6 +29,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
rm -f "$TEST_DIR/nbd"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
index cc95ff1..2c9d23b 100755
--- a/tests/qemu-iotests/156
+++ b/tests/qemu-iotests/156
@@ -37,6 +37,7 @@ status=1 # failure is the default!
_cleanup()
{
+ _cleanup_qemu
rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
}
trap "_cleanup; exit \$status" 0 1 2 3 15
--
2.9.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH v3 for-2.10] qemu-iotests: _cleanup_qemu must be called on exit
2017-04-18 19:42 [Qemu-devel] [PATCH v3 for-2.10] qemu-iotests: _cleanup_qemu must be called on exit Jeff Cody
@ 2017-04-20 15:09 ` Jeff Cody
0 siblings, 0 replies; 2+ messages in thread
From: Jeff Cody @ 2017-04-20 15:09 UTC (permalink / raw)
To: qemu-devel; +Cc: qemu-block, kwolf, mreitz, eblake
On Tue, Apr 18, 2017 at 03:42:41PM -0400, Jeff Cody wrote:
> For the tests that use the common.qemu functions for running a QEMU
> process, _cleanup_qemu must be called in the exit function.
>
> If it is not, if the qemu process aborts, then not all of the droppings
> are cleaned up (e.g. pidfile, fifos).
>
> This updates those tests that did not have a cleanup in qemu-iotests.
>
> (I swapped spaces for tabs in test 102 as well)
>
> Reported-by: Eric Blake <eblake@redhat.com>
> Reviewed-by: Eric Blake <eblake@redhat.com>
> Signed-off-by: Jeff Cody <jcody@redhat.com>
> ---
>
> v3 added test 156
> v2 fixed typo in test 094, s/cleanup/_cleanup/ for the trap function. (Eric)
>
> tests/qemu-iotests/028 | 1 +
> tests/qemu-iotests/094 | 11 ++++++++---
> tests/qemu-iotests/102 | 5 +++--
> tests/qemu-iotests/109 | 1 +
> tests/qemu-iotests/117 | 1 +
> tests/qemu-iotests/130 | 1 +
> tests/qemu-iotests/140 | 1 +
> tests/qemu-iotests/141 | 1 +
> tests/qemu-iotests/143 | 1 +
> tests/qemu-iotests/156 | 1 +
> 10 files changed, 19 insertions(+), 5 deletions(-)
>
> diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
> index 7783e57..97a8869 100755
> --- a/tests/qemu-iotests/028
> +++ b/tests/qemu-iotests/028
> @@ -32,6 +32,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> rm -f "${TEST_IMG}.copy"
> _cleanup_test_img
> }
> diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094
> index 0ba0b0c..9aa01e3 100755
> --- a/tests/qemu-iotests/094
> +++ b/tests/qemu-iotests/094
> @@ -27,7 +27,14 @@ echo "QA output created by $seq"
> here="$PWD"
> status=1 # failure is the default!
>
> -trap "exit \$status" 0 1 2 3 15
> +_cleanup()
> +{
> + _cleanup_qemu
> + _cleanup_test_img
> + rm -f "$TEST_DIR/source.$IMGFMT"
> +}
> +
> +trap "_cleanup; exit \$status" 0 1 2 3 15
>
> # get standard environment, filters and checks
> . ./common.rc
> @@ -73,8 +80,6 @@ _send_qemu_cmd $QEMU_HANDLE \
>
> wait=1 _cleanup_qemu
>
> -_cleanup_test_img
> -rm -f "$TEST_DIR/source.$IMGFMT"
>
> # success, all done
> echo '*** done'
> diff --git a/tests/qemu-iotests/102 b/tests/qemu-iotests/102
> index 64b4af9..87db1bb 100755
> --- a/tests/qemu-iotests/102
> +++ b/tests/qemu-iotests/102
> @@ -25,11 +25,12 @@ seq=$(basename $0)
> echo "QA output created by $seq"
>
> here=$PWD
> -status=1 # failure is the default!
> +status=1 # failure is the default!
>
> _cleanup()
> {
> - _cleanup_test_img
> + _cleanup_qemu
> + _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
>
> diff --git a/tests/qemu-iotests/109 b/tests/qemu-iotests/109
> index 927151a..6161633 100755
> --- a/tests/qemu-iotests/109
> +++ b/tests/qemu-iotests/109
> @@ -29,6 +29,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> rm -f $TEST_IMG.src
> _cleanup_test_img
> }
> diff --git a/tests/qemu-iotests/117 b/tests/qemu-iotests/117
> index e955d52..6c83461 100755
> --- a/tests/qemu-iotests/117
> +++ b/tests/qemu-iotests/117
> @@ -29,6 +29,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/130 b/tests/qemu-iotests/130
> index ecc8a5b..d4d148b 100755
> --- a/tests/qemu-iotests/130
> +++ b/tests/qemu-iotests/130
> @@ -31,6 +31,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> _cleanup_test_img
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/140 b/tests/qemu-iotests/140
> index 49f9df4..8c80a5a 100755
> --- a/tests/qemu-iotests/140
> +++ b/tests/qemu-iotests/140
> @@ -33,6 +33,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> _cleanup_test_img
> rm -f "$TEST_DIR/nbd"
> }
> diff --git a/tests/qemu-iotests/141 b/tests/qemu-iotests/141
> index 27fb1cc..40a3405 100755
> --- a/tests/qemu-iotests/141
> +++ b/tests/qemu-iotests/141
> @@ -29,6 +29,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> _cleanup_test_img
> rm -f "$TEST_DIR/{b,m,o}.$IMGFMT"
> }
> diff --git a/tests/qemu-iotests/143 b/tests/qemu-iotests/143
> index ec4ef22..5ff1944 100755
> --- a/tests/qemu-iotests/143
> +++ b/tests/qemu-iotests/143
> @@ -29,6 +29,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> rm -f "$TEST_DIR/nbd"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> diff --git a/tests/qemu-iotests/156 b/tests/qemu-iotests/156
> index cc95ff1..2c9d23b 100755
> --- a/tests/qemu-iotests/156
> +++ b/tests/qemu-iotests/156
> @@ -37,6 +37,7 @@ status=1 # failure is the default!
>
> _cleanup()
> {
> + _cleanup_qemu
> rm -f "$TEST_IMG{,.target}{,.backing,.overlay}"
> }
> trap "_cleanup; exit \$status" 0 1 2 3 15
> --
> 2.9.3
>
Thanks,
Applied to my block branch:
git://github.com/codyprime/qemu-kvm-jtc block
-Jeff
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-20 15:09 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-18 19:42 [Qemu-devel] [PATCH v3 for-2.10] qemu-iotests: _cleanup_qemu must be called on exit Jeff Cody
2017-04-20 15:09 ` Jeff Cody
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.