| Message ID | 20171204151741.14485-2-danielhb@linux.vnet.ibm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2017-12-04 16:17, Daniel Henrique Barboza wrote: > This patch implements a test case for the scenario that was failing > prior to the patch "migration/ram.c: do not set 'postcopy_running' in > POSTCOPY_INCOMING_END", commit acab30b85d. > > This new test file 201 was derived from the test file 181 authored > by Kevin Wolf. > > CC: Kevin Wolf <kwolf@redhat.com> > CC: Max Reitz <mreitz@redhat.com> > CC: Cleber Rosa <crosa@redhat.com> > Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> > --- > tests/qemu-iotests/201 | 116 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/201.out | 23 +++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 140 insertions(+) > create mode 100755 tests/qemu-iotests/201 > create mode 100644 tests/qemu-iotests/201.out Thanks, I've added the patch to my block-next branch for 2.12: https://github.com/XanClic/qemu/commits/block-next (Technically, tests can be added at any time, but I guess we don't want any patches before the release at this point.) Max
On 2017-12-04 16:17, Daniel Henrique Barboza wrote: > This patch implements a test case for the scenario that was failing > prior to the patch "migration/ram.c: do not set 'postcopy_running' in > POSTCOPY_INCOMING_END", commit acab30b85d. > > This new test file 201 was derived from the test file 181 authored > by Kevin Wolf. > > CC: Kevin Wolf <kwolf@redhat.com> > CC: Max Reitz <mreitz@redhat.com> > CC: Cleber Rosa <crosa@redhat.com> > Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> > --- > tests/qemu-iotests/201 | 116 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/201.out | 23 +++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 140 insertions(+) > create mode 100755 tests/qemu-iotests/201 > create mode 100644 tests/qemu-iotests/201.out > > diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 > new file mode 100755 > index 0000000000..9b6e23bbfc > --- /dev/null > +++ b/tests/qemu-iotests/201 > @@ -0,0 +1,116 @@ > +#!/bin/bash > +# > +# Test savevm and loadvm after live migration with postcopy flag > +# > +# Copyright (C) 2017, IBM Corporation. > +# > +# This file is derived from tests/qemu-iotests/181 by Kevin Wolf > +# > +# 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 <http://www.gnu.org/licenses/>. > + > +seq=`basename $0` > +echo "QA output created by $seq" > + > +status=1 # failure is the default! > + > +MIG_SOCKET="${TEST_DIR}/migrate" > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > +. ./common.qemu > + > +_cleanup() > +{ > + rm -f "${MIG_SOCKET}" > + _cleanup_test_img > + _cleanup_qemu > +} > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +_supported_fmt qcow2 > +_supported_proto generic > +_supported_os Linux Sorry, I had to unqueue the patch again, because I only just saw there's something like > # Internal snapshots are (currently) impossible with refcount_bits=1 > _unsupported_imgopts 'refcount_bits=1[^0-9]' missing here (taken from 080). (Without that, the test fails with $ ./check -T -qcow2 -o refcount_bits=1 201 ) I could have added it myself, but that seemed a bit too much of a change to me... Max > + > +size=64M > +_make_test_img $size
On 12/04/2017 08:23 PM, Max Reitz wrote: > On 2017-12-04 16:17, Daniel Henrique Barboza wrote: >> This patch implements a test case for the scenario that was failing >> prior to the patch "migration/ram.c: do not set 'postcopy_running' in >> POSTCOPY_INCOMING_END", commit acab30b85d. >> >> This new test file 201 was derived from the test file 181 authored >> by Kevin Wolf. >> >> CC: Kevin Wolf <kwolf@redhat.com> >> CC: Max Reitz <mreitz@redhat.com> >> CC: Cleber Rosa <crosa@redhat.com> >> Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> >> --- >> tests/qemu-iotests/201 | 116 +++++++++++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/201.out | 23 +++++++++ >> tests/qemu-iotests/group | 1 + >> 3 files changed, 140 insertions(+) >> create mode 100755 tests/qemu-iotests/201 >> create mode 100644 tests/qemu-iotests/201.out >> >> diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 >> new file mode 100755 >> index 0000000000..9b6e23bbfc >> --- /dev/null >> +++ b/tests/qemu-iotests/201 >> @@ -0,0 +1,116 @@ >> +#!/bin/bash >> +# >> +# Test savevm and loadvm after live migration with postcopy flag >> +# >> +# Copyright (C) 2017, IBM Corporation. >> +# >> +# This file is derived from tests/qemu-iotests/181 by Kevin Wolf >> +# >> +# 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 <http://www.gnu.org/licenses/>. >> + >> +seq=`basename $0` >> +echo "QA output created by $seq" >> + >> +status=1 # failure is the default! >> + >> +MIG_SOCKET="${TEST_DIR}/migrate" >> + >> +# get standard environment, filters and checks >> +. ./common.rc >> +. ./common.filter >> +. ./common.qemu >> + >> +_cleanup() >> +{ >> + rm -f "${MIG_SOCKET}" >> + _cleanup_test_img >> + _cleanup_qemu >> +} >> +trap "_cleanup; exit \$status" 0 1 2 3 15 >> + >> +_supported_fmt qcow2 >> +_supported_proto generic >> +_supported_os Linux > Sorry, I had to unqueue the patch again, because I only just saw there's > something like > >> # Internal snapshots are (currently) impossible with refcount_bits=1 >> _unsupported_imgopts 'refcount_bits=1[^0-9]' > missing here (taken from 080). > > (Without that, the test fails with > $ ./check -T -qcow2 -o refcount_bits=1 201 > ) > > I could have added it myself, but that seemed a bit too much of a change > to me... No problem, I'll resend with that extra instruction. I have a question though: is there a way to run a qemu-iotest with all the parameters combinations (image type, image protocol ...) that the test must support? Thanks, Daniel > > Max > >> + >> +size=64M >> +_make_test_img $size
* Daniel Henrique Barboza (danielhb@linux.vnet.ibm.com) wrote: > This patch implements a test case for the scenario that was failing > prior to the patch "migration/ram.c: do not set 'postcopy_running' in > POSTCOPY_INCOMING_END", commit acab30b85d. > > This new test file 201 was derived from the test file 181 authored > by Kevin Wolf. The test is interesting because it enables postcopy but never triggers postcopy entry (using migrate_start_postcopy). Still it's a good path to check. It will fail to enable postcopy on older linux hosts or non-linux hosts that don't have userfault though; I'm not sure how your test fails with that. Dave > CC: Kevin Wolf <kwolf@redhat.com> > CC: Max Reitz <mreitz@redhat.com> > CC: Cleber Rosa <crosa@redhat.com> > Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> > --- > tests/qemu-iotests/201 | 116 +++++++++++++++++++++++++++++++++++++++++++++ > tests/qemu-iotests/201.out | 23 +++++++++ > tests/qemu-iotests/group | 1 + > 3 files changed, 140 insertions(+) > create mode 100755 tests/qemu-iotests/201 > create mode 100644 tests/qemu-iotests/201.out > > diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 > new file mode 100755 > index 0000000000..9b6e23bbfc > --- /dev/null > +++ b/tests/qemu-iotests/201 > @@ -0,0 +1,116 @@ > +#!/bin/bash > +# > +# Test savevm and loadvm after live migration with postcopy flag > +# > +# Copyright (C) 2017, IBM Corporation. > +# > +# This file is derived from tests/qemu-iotests/181 by Kevin Wolf > +# > +# 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 <http://www.gnu.org/licenses/>. > + > +seq=`basename $0` > +echo "QA output created by $seq" > + > +status=1 # failure is the default! > + > +MIG_SOCKET="${TEST_DIR}/migrate" > + > +# get standard environment, filters and checks > +. ./common.rc > +. ./common.filter > +. ./common.qemu > + > +_cleanup() > +{ > + rm -f "${MIG_SOCKET}" > + _cleanup_test_img > + _cleanup_qemu > +} > +trap "_cleanup; exit \$status" 0 1 2 3 15 > + > +_supported_fmt qcow2 > +_supported_proto generic > +_supported_os Linux > + > +size=64M > +_make_test_img $size > + > +echo > +echo === Starting VMs === > +echo > + > +qemu_comm_method="monitor" > + > +if [ "$IMGOPTSSYNTAX" = "true" ]; then > + _launch_qemu \ > + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk > +else > + _launch_qemu \ > + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk > +fi > +src=$QEMU_HANDLE > + > +if [ "$IMGOPTSSYNTAX" = "true" ]; then > + _launch_qemu \ > + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk \ > + -incoming "unix:${MIG_SOCKET}" > +else > + _launch_qemu \ > + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk \ > + -incoming "unix:${MIG_SOCKET}" > +fi > +dest=$QEMU_HANDLE > + > +echo > +echo === Set \'migrate_set_capability postcopy-ram on\' and migrate === > +echo > + > +silent=yes > +_send_qemu_cmd $dest 'migrate_set_capability postcopy-ram on' "(qemu)" > +_send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" > +_send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" > + > +QEMU_COMM_TIMEOUT=1 qemu_cmd_repeat=10 silent=yes \ > + _send_qemu_cmd $src "info migrate" "completed\|failed" > +silent=yes _send_qemu_cmd $src "" "(qemu)" > + > +echo > +echo === Check if migration was successful === > +echo > + > +QEMU_COMM_TIMEOUT=1 silent=yes \ > + _send_qemu_cmd $src "info migrate" "completed" > +silent=yes _send_qemu_cmd $src "" "(qemu)" > + > +echo > +echo === On destination, execute savevm and loadvm === > +echo > + > +silent= > +_send_qemu_cmd $dest 'savevm state1' "(qemu)" > +_send_qemu_cmd $dest 'loadvm state1' "(qemu)" > + > +echo > +echo === Shut down and check image === > +echo > + > +_send_qemu_cmd $src 'quit' "" > +_send_qemu_cmd $dest 'quit' "" > +wait=1 _cleanup_qemu > + > +_check_test_img > + > +# success, all done > +echo "*** done" > +status=0 > diff --git a/tests/qemu-iotests/201.out b/tests/qemu-iotests/201.out > new file mode 100644 > index 0000000000..9faf06f996 > --- /dev/null > +++ b/tests/qemu-iotests/201.out > @@ -0,0 +1,23 @@ > +QA output created by 201 > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > + > +=== Starting VMs === > + > + > +=== Set 'migrate_set_capability postcopy-ram on' and migrate === > + > + > +=== Check if migration was successful === > + > + > +=== On destination, execute savevm and loadvm === > + > +(qemu) savevm state1 > +(qemu) loadvm state1 > + > +=== Shut down and check image === > + > +(qemu) quit > +(qemu) quit > +No errors were found on the image. > +*** done > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > index 3e688678dd..c16bc2c5e2 100644 > --- a/tests/qemu-iotests/group > +++ b/tests/qemu-iotests/group > @@ -197,3 +197,4 @@ > 197 rw auto quick > 198 rw auto > 200 rw auto > +201 rw auto migration > -- > 2.13.6 > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
On 12/05/2017 04:06 PM, Dr. David Alan Gilbert wrote: > * Daniel Henrique Barboza (danielhb@linux.vnet.ibm.com) wrote: >> This patch implements a test case for the scenario that was failing >> prior to the patch "migration/ram.c: do not set 'postcopy_running' in >> POSTCOPY_INCOMING_END", commit acab30b85d. >> >> This new test file 201 was derived from the test file 181 authored >> by Kevin Wolf. > The test is interesting because it enables postcopy but never triggers > postcopy entry (using migrate_start_postcopy). Still it's a good path > to check. > > It will fail to enable postcopy on older linux hosts or non-linux hosts > that don't have userfault though; I'm not sure how your test fails > with that. Hmmm I am not sure either. I have tested it with Travis and it passed all tests, including a claimed Mac OS environment. Not sure if that counts. I'll see if I can get this tested on a Windows env to see how this test fails. Daniel > > Dave > >> CC: Kevin Wolf <kwolf@redhat.com> >> CC: Max Reitz <mreitz@redhat.com> >> CC: Cleber Rosa <crosa@redhat.com> >> Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> >> --- >> tests/qemu-iotests/201 | 116 +++++++++++++++++++++++++++++++++++++++++++++ >> tests/qemu-iotests/201.out | 23 +++++++++ >> tests/qemu-iotests/group | 1 + >> 3 files changed, 140 insertions(+) >> create mode 100755 tests/qemu-iotests/201 >> create mode 100644 tests/qemu-iotests/201.out >> >> diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 >> new file mode 100755 >> index 0000000000..9b6e23bbfc >> --- /dev/null >> +++ b/tests/qemu-iotests/201 >> @@ -0,0 +1,116 @@ >> +#!/bin/bash >> +# >> +# Test savevm and loadvm after live migration with postcopy flag >> +# >> +# Copyright (C) 2017, IBM Corporation. >> +# >> +# This file is derived from tests/qemu-iotests/181 by Kevin Wolf >> +# >> +# 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 <http://www.gnu.org/licenses/>. >> + >> +seq=`basename $0` >> +echo "QA output created by $seq" >> + >> +status=1 # failure is the default! >> + >> +MIG_SOCKET="${TEST_DIR}/migrate" >> + >> +# get standard environment, filters and checks >> +. ./common.rc >> +. ./common.filter >> +. ./common.qemu >> + >> +_cleanup() >> +{ >> + rm -f "${MIG_SOCKET}" >> + _cleanup_test_img >> + _cleanup_qemu >> +} >> +trap "_cleanup; exit \$status" 0 1 2 3 15 >> + >> +_supported_fmt qcow2 >> +_supported_proto generic >> +_supported_os Linux >> + >> +size=64M >> +_make_test_img $size >> + >> +echo >> +echo === Starting VMs === >> +echo >> + >> +qemu_comm_method="monitor" >> + >> +if [ "$IMGOPTSSYNTAX" = "true" ]; then >> + _launch_qemu \ >> + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk >> +else >> + _launch_qemu \ >> + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk >> +fi >> +src=$QEMU_HANDLE >> + >> +if [ "$IMGOPTSSYNTAX" = "true" ]; then >> + _launch_qemu \ >> + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk \ >> + -incoming "unix:${MIG_SOCKET}" >> +else >> + _launch_qemu \ >> + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk \ >> + -incoming "unix:${MIG_SOCKET}" >> +fi >> +dest=$QEMU_HANDLE >> + >> +echo >> +echo === Set \'migrate_set_capability postcopy-ram on\' and migrate === >> +echo >> + >> +silent=yes >> +_send_qemu_cmd $dest 'migrate_set_capability postcopy-ram on' "(qemu)" >> +_send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" >> +_send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" >> + >> +QEMU_COMM_TIMEOUT=1 qemu_cmd_repeat=10 silent=yes \ >> + _send_qemu_cmd $src "info migrate" "completed\|failed" >> +silent=yes _send_qemu_cmd $src "" "(qemu)" >> + >> +echo >> +echo === Check if migration was successful === >> +echo >> + >> +QEMU_COMM_TIMEOUT=1 silent=yes \ >> + _send_qemu_cmd $src "info migrate" "completed" >> +silent=yes _send_qemu_cmd $src "" "(qemu)" >> + >> +echo >> +echo === On destination, execute savevm and loadvm === >> +echo >> + >> +silent= >> +_send_qemu_cmd $dest 'savevm state1' "(qemu)" >> +_send_qemu_cmd $dest 'loadvm state1' "(qemu)" >> + >> +echo >> +echo === Shut down and check image === >> +echo >> + >> +_send_qemu_cmd $src 'quit' "" >> +_send_qemu_cmd $dest 'quit' "" >> +wait=1 _cleanup_qemu >> + >> +_check_test_img >> + >> +# success, all done >> +echo "*** done" >> +status=0 >> diff --git a/tests/qemu-iotests/201.out b/tests/qemu-iotests/201.out >> new file mode 100644 >> index 0000000000..9faf06f996 >> --- /dev/null >> +++ b/tests/qemu-iotests/201.out >> @@ -0,0 +1,23 @@ >> +QA output created by 201 >> +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 >> + >> +=== Starting VMs === >> + >> + >> +=== Set 'migrate_set_capability postcopy-ram on' and migrate === >> + >> + >> +=== Check if migration was successful === >> + >> + >> +=== On destination, execute savevm and loadvm === >> + >> +(qemu) savevm state1 >> +(qemu) loadvm state1 >> + >> +=== Shut down and check image === >> + >> +(qemu) quit >> +(qemu) quit >> +No errors were found on the image. >> +*** done >> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group >> index 3e688678dd..c16bc2c5e2 100644 >> --- a/tests/qemu-iotests/group >> +++ b/tests/qemu-iotests/group >> @@ -197,3 +197,4 @@ >> 197 rw auto quick >> 198 rw auto >> 200 rw auto >> +201 rw auto migration >> -- >> 2.13.6 >> >> > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK >
* Daniel Henrique Barboza (danielhb@linux.vnet.ibm.com) wrote: > > > On 12/05/2017 04:06 PM, Dr. David Alan Gilbert wrote: > > * Daniel Henrique Barboza (danielhb@linux.vnet.ibm.com) wrote: > > > This patch implements a test case for the scenario that was failing > > > prior to the patch "migration/ram.c: do not set 'postcopy_running' in > > > POSTCOPY_INCOMING_END", commit acab30b85d. > > > > > > This new test file 201 was derived from the test file 181 authored > > > by Kevin Wolf. > > The test is interesting because it enables postcopy but never triggers > > postcopy entry (using migrate_start_postcopy). Still it's a good path > > to check. > > > > It will fail to enable postcopy on older linux hosts or non-linux hosts > > that don't have userfault though; I'm not sure how your test fails > > with that. > Hmmm I am not sure either. I have tested it with Travis and it passed all > tests, > including a claimed Mac OS environment. Not sure if that counts. > > I'll see if I can get this tested on a Windows env to see how this test > fails. Maybe it's the 'silent=yes' - I'm not sure what silent that silences; but the migrate_set_capabilities should fail on the old hosts, but if you're losing the errors then I guess you'll be blissfully unaware. Dave > > Daniel > > > > > Dave > > > > > CC: Kevin Wolf <kwolf@redhat.com> > > > CC: Max Reitz <mreitz@redhat.com> > > > CC: Cleber Rosa <crosa@redhat.com> > > > Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> > > > --- > > > tests/qemu-iotests/201 | 116 +++++++++++++++++++++++++++++++++++++++++++++ > > > tests/qemu-iotests/201.out | 23 +++++++++ > > > tests/qemu-iotests/group | 1 + > > > 3 files changed, 140 insertions(+) > > > create mode 100755 tests/qemu-iotests/201 > > > create mode 100644 tests/qemu-iotests/201.out > > > > > > diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 > > > new file mode 100755 > > > index 0000000000..9b6e23bbfc > > > --- /dev/null > > > +++ b/tests/qemu-iotests/201 > > > @@ -0,0 +1,116 @@ > > > +#!/bin/bash > > > +# > > > +# Test savevm and loadvm after live migration with postcopy flag > > > +# > > > +# Copyright (C) 2017, IBM Corporation. > > > +# > > > +# This file is derived from tests/qemu-iotests/181 by Kevin Wolf > > > +# > > > +# 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 <http://www.gnu.org/licenses/>. > > > + > > > +seq=`basename $0` > > > +echo "QA output created by $seq" > > > + > > > +status=1 # failure is the default! > > > + > > > +MIG_SOCKET="${TEST_DIR}/migrate" > > > + > > > +# get standard environment, filters and checks > > > +. ./common.rc > > > +. ./common.filter > > > +. ./common.qemu > > > + > > > +_cleanup() > > > +{ > > > + rm -f "${MIG_SOCKET}" > > > + _cleanup_test_img > > > + _cleanup_qemu > > > +} > > > +trap "_cleanup; exit \$status" 0 1 2 3 15 > > > + > > > +_supported_fmt qcow2 > > > +_supported_proto generic > > > +_supported_os Linux > > > + > > > +size=64M > > > +_make_test_img $size > > > + > > > +echo > > > +echo === Starting VMs === > > > +echo > > > + > > > +qemu_comm_method="monitor" > > > + > > > +if [ "$IMGOPTSSYNTAX" = "true" ]; then > > > + _launch_qemu \ > > > + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk > > > +else > > > + _launch_qemu \ > > > + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk > > > +fi > > > +src=$QEMU_HANDLE > > > + > > > +if [ "$IMGOPTSSYNTAX" = "true" ]; then > > > + _launch_qemu \ > > > + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk \ > > > + -incoming "unix:${MIG_SOCKET}" > > > +else > > > + _launch_qemu \ > > > + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk \ > > > + -incoming "unix:${MIG_SOCKET}" > > > +fi > > > +dest=$QEMU_HANDLE > > > + > > > +echo > > > +echo === Set \'migrate_set_capability postcopy-ram on\' and migrate === > > > +echo > > > + > > > +silent=yes > > > +_send_qemu_cmd $dest 'migrate_set_capability postcopy-ram on' "(qemu)" > > > +_send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" > > > +_send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" > > > + > > > +QEMU_COMM_TIMEOUT=1 qemu_cmd_repeat=10 silent=yes \ > > > + _send_qemu_cmd $src "info migrate" "completed\|failed" > > > +silent=yes _send_qemu_cmd $src "" "(qemu)" > > > + > > > +echo > > > +echo === Check if migration was successful === > > > +echo > > > + > > > +QEMU_COMM_TIMEOUT=1 silent=yes \ > > > + _send_qemu_cmd $src "info migrate" "completed" > > > +silent=yes _send_qemu_cmd $src "" "(qemu)" > > > + > > > +echo > > > +echo === On destination, execute savevm and loadvm === > > > +echo > > > + > > > +silent= > > > +_send_qemu_cmd $dest 'savevm state1' "(qemu)" > > > +_send_qemu_cmd $dest 'loadvm state1' "(qemu)" > > > + > > > +echo > > > +echo === Shut down and check image === > > > +echo > > > + > > > +_send_qemu_cmd $src 'quit' "" > > > +_send_qemu_cmd $dest 'quit' "" > > > +wait=1 _cleanup_qemu > > > + > > > +_check_test_img > > > + > > > +# success, all done > > > +echo "*** done" > > > +status=0 > > > diff --git a/tests/qemu-iotests/201.out b/tests/qemu-iotests/201.out > > > new file mode 100644 > > > index 0000000000..9faf06f996 > > > --- /dev/null > > > +++ b/tests/qemu-iotests/201.out > > > @@ -0,0 +1,23 @@ > > > +QA output created by 201 > > > +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 > > > + > > > +=== Starting VMs === > > > + > > > + > > > +=== Set 'migrate_set_capability postcopy-ram on' and migrate === > > > + > > > + > > > +=== Check if migration was successful === > > > + > > > + > > > +=== On destination, execute savevm and loadvm === > > > + > > > +(qemu) savevm state1 > > > +(qemu) loadvm state1 > > > + > > > +=== Shut down and check image === > > > + > > > +(qemu) quit > > > +(qemu) quit > > > +No errors were found on the image. > > > +*** done > > > diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group > > > index 3e688678dd..c16bc2c5e2 100644 > > > --- a/tests/qemu-iotests/group > > > +++ b/tests/qemu-iotests/group > > > @@ -197,3 +197,4 @@ > > > 197 rw auto quick > > > 198 rw auto > > > 200 rw auto > > > +201 rw auto migration > > > -- > > > 2.13.6 > > > > > > > > -- > > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK > > > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK
Am 05.12.2017 um 20:31 hat Daniel Henrique Barboza geschrieben: > On 12/05/2017 04:06 PM, Dr. David Alan Gilbert wrote: > > * Daniel Henrique Barboza (danielhb@linux.vnet.ibm.com) wrote: > > > This patch implements a test case for the scenario that was failing > > > prior to the patch "migration/ram.c: do not set 'postcopy_running' in > > > POSTCOPY_INCOMING_END", commit acab30b85d. > > > > > > This new test file 201 was derived from the test file 181 authored > > > by Kevin Wolf. > > The test is interesting because it enables postcopy but never triggers > > postcopy entry (using migrate_start_postcopy). Still it's a good path > > to check. > > > > It will fail to enable postcopy on older linux hosts or non-linux hosts > > that don't have userfault though; I'm not sure how your test fails > > with that. > Hmmm I am not sure either. I have tested it with Travis and it passed all > tests, > including a claimed Mac OS environment. Not sure if that counts. > > I'll see if I can get this tested on a Windows env to see how this test > fails. qemu-iotests is basically Linux-only and we don't even try to keep things portable. If it works on Windows, that's more by accident than intentional. Kevin
diff --git a/tests/qemu-iotests/201 b/tests/qemu-iotests/201 new file mode 100755 index 0000000000..9b6e23bbfc --- /dev/null +++ b/tests/qemu-iotests/201 @@ -0,0 +1,116 @@ +#!/bin/bash +# +# Test savevm and loadvm after live migration with postcopy flag +# +# Copyright (C) 2017, IBM Corporation. +# +# This file is derived from tests/qemu-iotests/181 by Kevin Wolf +# +# 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 <http://www.gnu.org/licenses/>. + +seq=`basename $0` +echo "QA output created by $seq" + +status=1 # failure is the default! + +MIG_SOCKET="${TEST_DIR}/migrate" + +# get standard environment, filters and checks +. ./common.rc +. ./common.filter +. ./common.qemu + +_cleanup() +{ + rm -f "${MIG_SOCKET}" + _cleanup_test_img + _cleanup_qemu +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + +_supported_fmt qcow2 +_supported_proto generic +_supported_os Linux + +size=64M +_make_test_img $size + +echo +echo === Starting VMs === +echo + +qemu_comm_method="monitor" + +if [ "$IMGOPTSSYNTAX" = "true" ]; then + _launch_qemu \ + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk +else + _launch_qemu \ + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk +fi +src=$QEMU_HANDLE + +if [ "$IMGOPTSSYNTAX" = "true" ]; then + _launch_qemu \ + -drive "${TEST_IMG}",cache=${CACHEMODE},id=disk \ + -incoming "unix:${MIG_SOCKET}" +else + _launch_qemu \ + -drive file="${TEST_IMG}",cache=${CACHEMODE},driver=$IMGFMT,id=disk \ + -incoming "unix:${MIG_SOCKET}" +fi +dest=$QEMU_HANDLE + +echo +echo === Set \'migrate_set_capability postcopy-ram on\' and migrate === +echo + +silent=yes +_send_qemu_cmd $dest 'migrate_set_capability postcopy-ram on' "(qemu)" +_send_qemu_cmd $src 'migrate_set_capability postcopy-ram on' "(qemu)" +_send_qemu_cmd $src "migrate -d unix:${MIG_SOCKET}" "(qemu)" + +QEMU_COMM_TIMEOUT=1 qemu_cmd_repeat=10 silent=yes \ + _send_qemu_cmd $src "info migrate" "completed\|failed" +silent=yes _send_qemu_cmd $src "" "(qemu)" + +echo +echo === Check if migration was successful === +echo + +QEMU_COMM_TIMEOUT=1 silent=yes \ + _send_qemu_cmd $src "info migrate" "completed" +silent=yes _send_qemu_cmd $src "" "(qemu)" + +echo +echo === On destination, execute savevm and loadvm === +echo + +silent= +_send_qemu_cmd $dest 'savevm state1' "(qemu)" +_send_qemu_cmd $dest 'loadvm state1' "(qemu)" + +echo +echo === Shut down and check image === +echo + +_send_qemu_cmd $src 'quit' "" +_send_qemu_cmd $dest 'quit' "" +wait=1 _cleanup_qemu + +_check_test_img + +# success, all done +echo "*** done" +status=0 diff --git a/tests/qemu-iotests/201.out b/tests/qemu-iotests/201.out new file mode 100644 index 0000000000..9faf06f996 --- /dev/null +++ b/tests/qemu-iotests/201.out @@ -0,0 +1,23 @@ +QA output created by 201 +Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864 + +=== Starting VMs === + + +=== Set 'migrate_set_capability postcopy-ram on' and migrate === + + +=== Check if migration was successful === + + +=== On destination, execute savevm and loadvm === + +(qemu) savevm state1 +(qemu) loadvm state1 + +=== Shut down and check image === + +(qemu) quit +(qemu) quit +No errors were found on the image. +*** done diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group index 3e688678dd..c16bc2c5e2 100644 --- a/tests/qemu-iotests/group +++ b/tests/qemu-iotests/group @@ -197,3 +197,4 @@ 197 rw auto quick 198 rw auto 200 rw auto +201 rw auto migration
This patch implements a test case for the scenario that was failing prior to the patch "migration/ram.c: do not set 'postcopy_running' in POSTCOPY_INCOMING_END", commit acab30b85d. This new test file 201 was derived from the test file 181 authored by Kevin Wolf. CC: Kevin Wolf <kwolf@redhat.com> CC: Max Reitz <mreitz@redhat.com> CC: Cleber Rosa <crosa@redhat.com> Signed-off-by: Daniel Henrique Barboza <danielhb@linux.vnet.ibm.com> --- tests/qemu-iotests/201 | 116 +++++++++++++++++++++++++++++++++++++++++++++ tests/qemu-iotests/201.out | 23 +++++++++ tests/qemu-iotests/group | 1 + 3 files changed, 140 insertions(+) create mode 100755 tests/qemu-iotests/201 create mode 100644 tests/qemu-iotests/201.out