From 2c94e2714c728354d2924c04dec97f12e31742ad Mon Sep 17 00:00:00 2001 From: Kashyap Chamarthy Date: Tue, 29 Aug 2017 18:50:58 +0200 Subject: qemu-iotests: Extend non-shared storage migration test (194) This is the follow-up patch that was discussed[*] as part of feedback to qemu-iotest 194. Changes in this patch: - Supply 'job-id' parameter to `drive-mirror` invocation. - Once migration completes, issue QMP `block-job-cancel` command on the source QEMU to gracefully complete `drive-mirror` operation. - Once the BLOCK_JOB_COMPLETED event is emitted, stop the NBD server on the destination QEMU. - Check for both the events: MIGRATION and BLOCK_JOB_COMPLETED. With the above, the test will also be (almost) in sync with the procedure outlined in the document 'live-block-operations.rst'[+] (section: "QMP invocation for live storage migration with ``drive-mirror`` + NBD"). [*] https://lists.nongnu.org/archive/html/qemu-devel/2017-08/msg04820.html -- qemu-iotests: add 194 non-shared storage migration test [+] https://git.qemu.org/gitweb.cgi?p=qemu.git;a=blob;f=docs/interop/live-block-operations.rst Signed-off-by: Kashyap Chamarthy Message-Id: <20170829165058.8229-1-kchamart@redhat.com> Reviewed-by: Stefan Hajnoczi Signed-off-by: Eric Blake --- tests/qemu-iotests/194 | 23 +++++++++++++++++------ tests/qemu-iotests/194.out | 11 ++++++++--- 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/qemu-iotests/194 b/tests/qemu-iotests/194 index 8028111e21..a3e3bad664 100755 --- a/tests/qemu-iotests/194 +++ b/tests/qemu-iotests/194 @@ -46,16 +46,17 @@ iotests.log('Launching NBD server on destination...') iotests.log(dest_vm.qmp('nbd-server-start', addr={'type': 'unix', 'data': {'path': nbd_sock_path}})) iotests.log(dest_vm.qmp('nbd-server-add', device='drive0', writable=True)) -iotests.log('Starting drive-mirror on source...') +iotests.log('Starting `drive-mirror` on source...') iotests.log(source_vm.qmp( 'drive-mirror', device='drive0', target='nbd+unix:///drive0?socket={0}'.format(nbd_sock_path), sync='full', format='raw', # always raw, the server handles the format - mode='existing')) + mode='existing', + job_id='mirror-job0')) -iotests.log('Waiting for drive-mirror to complete...') +iotests.log('Waiting for `drive-mirror` to complete...') iotests.log(source_vm.event_wait('BLOCK_JOB_READY'), filters=[iotests.filter_qmp_event]) @@ -67,7 +68,17 @@ dest_vm.qmp('migrate-set-capabilities', iotests.log(source_vm.qmp('migrate', uri='unix:{0}'.format(migration_sock_path))) while True: - event = source_vm.event_wait('MIGRATION') - iotests.log(event, filters=[iotests.filter_qmp_event]) - if event['data']['status'] in ('completed', 'failed'): + event1 = source_vm.event_wait('MIGRATION') + iotests.log(event1, filters=[iotests.filter_qmp_event]) + if event1['data']['status'] in ('completed', 'failed'): + iotests.log('Gracefully ending the `drive-mirror` job on source...') + iotests.log(source_vm.qmp('block-job-cancel', device='mirror-job0')) + break + +while True: + event2 = source_vm.event_wait('BLOCK_JOB_COMPLETED') + iotests.log(event2, filters=[iotests.filter_qmp_event]) + if event2['event'] == 'BLOCK_JOB_COMPLETED': + iotests.log('Stopping the NBD server on destination...') + iotests.log(dest_vm.qmp('nbd-server-stop')) break diff --git a/tests/qemu-iotests/194.out b/tests/qemu-iotests/194.out index ae501fecac..50ac50da5e 100644 --- a/tests/qemu-iotests/194.out +++ b/tests/qemu-iotests/194.out @@ -2,12 +2,17 @@ Launching VMs... Launching NBD server on destination... {u'return': {}} {u'return': {}} -Starting drive-mirror on source... +Starting `drive-mirror` on source... {u'return': {}} -Waiting for drive-mirror to complete... -{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'device': u'drive0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u'offset': 1073741824}, u'event': u'BLOCK_JOB_READY'} +Waiting for `drive-mirror` to complete... +{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'device': u'mirror-job0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u'offset': 1073741824}, u'event': u'BLOCK_JOB_READY'} Starting migration... {u'return': {}} {u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'setup'}, u'event': u'MIGRATION'} {u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'active'}, u'event': u'MIGRATION'} {u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'status': u'completed'}, u'event': u'MIGRATION'} +Gracefully ending the `drive-mirror` job on source... +{u'return': {}} +{u'timestamp': {u'seconds': 'SECS', u'microseconds': 'USECS'}, u'data': {u'device': u'mirror-job0', u'type': u'mirror', u'speed': 0, u'len': 1073741824, u'offset': 1073741824}, u'event': u'BLOCK_JOB_COMPLETED'} +Stopping the NBD server on destination... +{u'return': {}} -- cgit v1.2.3-55-g7522 From 6e592fc92234a58c7156c385840633c17dedd24f Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Tue, 29 Aug 2017 13:27:44 +0100 Subject: qemu-iotests: improve nbd-fault-injector.py startup protocol Currently 083 waits for the nbd-fault-injector.py server to start up by looping until netstat shows the TCP listen socket. The startup protocol can be simplified by passing a 0 port number to nbd-fault-injector.py. The kernel will allocate a port in bind(2) and the final port number can be printed by nbd-fault-injector.py. This should make it slightly nicer and less TCP-specific to wait for server startup. This patch changes nbd-fault-injector.py, the next one will rewrite server startup in 083. Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi Message-Id: <20170829122745.14309-3-stefanha@redhat.com> Signed-off-by: Eric Blake --- tests/qemu-iotests/nbd-fault-injector.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests') diff --git a/tests/qemu-iotests/nbd-fault-injector.py b/tests/qemu-iotests/nbd-fault-injector.py index 6c07191a5a..1c10dcb51c 100755 --- a/tests/qemu-iotests/nbd-fault-injector.py +++ b/tests/qemu-iotests/nbd-fault-injector.py @@ -235,11 +235,15 @@ def open_socket(path): sock = socket.socket() sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock.bind((host, int(port))) + + # If given port was 0 the final port number is now available + path = '%s:%d' % sock.getsockname() else: sock = socket.socket(socket.AF_UNIX) sock.bind(path) sock.listen(0) print 'Listening on %s' % path + sys.stdout.flush() # another process may be waiting, show message now return sock def usage(args): -- cgit v1.2.3-55-g7522 From 02d2d860d25e439f0e88658c701668ab684568fb Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Tue, 29 Aug 2017 13:27:45 +0100 Subject: qemu-iotests: test NBD over UNIX domain sockets in 083 083 only tests TCP. Some failures might be specific to UNIX domain sockets. A few adjustments are necessary: 1. Generating a port number and waiting for server startup is TCP-specific. Use the new nbd-fault-injector.py startup protocol to fetch the address. This is a little more elegant because we don't need netstat anymore. 2. The NBD filter does not work for the UNIX domain sockets URIs we generate and must be extended. 3. Run all tests twice: once for TCP and once for UNIX domain sockets. Reviewed-by: Eric Blake Signed-off-by: Stefan Hajnoczi Message-Id: <20170829122745.14309-4-stefanha@redhat.com> Signed-off-by: Eric Blake --- tests/qemu-iotests/083 | 136 ++++++++++++++++++++++-------------- tests/qemu-iotests/083.out | 145 ++++++++++++++++++++++++++++++++++----- tests/qemu-iotests/common.filter | 4 +- 3 files changed, 214 insertions(+), 71 deletions(-) (limited to 'tests') diff --git a/tests/qemu-iotests/083 b/tests/qemu-iotests/083 index bff9360048..0306f112da 100755 --- a/tests/qemu-iotests/083 +++ b/tests/qemu-iotests/083 @@ -27,6 +27,14 @@ echo "QA output created by $seq" here=`pwd` status=1 # failure is the default! +_cleanup() +{ + rm -f nbd.sock + rm -f nbd-fault-injector.out + rm -f nbd-fault-injector.conf +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + # get standard environment, filters and checks . ./common.rc . ./common.filter @@ -35,81 +43,105 @@ _supported_fmt generic _supported_proto nbd _supported_os Linux -# Pick a TCP port based on our pid. This way multiple instances of this test -# can run in parallel without conflicting. -choose_tcp_port() { - echo $((($$ % 31744) + 1024)) # 1024 <= port < 32768 -} - -wait_for_tcp_port() { - while ! (netstat --tcp --listening --numeric | \ - grep "$1.*0\\.0\\.0\\.0:\\*.*LISTEN") >/dev/null 2>&1; do - sleep 0.1 +check_disconnect() { + local event export_name=foo extra_args nbd_addr nbd_url proto when + + while true; do + case $1 in + --classic-negotiation) + shift + extra_args=--classic-negotiation + export_name= + ;; + --tcp) + shift + proto=tcp + ;; + --unix) + shift + proto=unix + ;; + *) + break + ;; + esac done -} -check_disconnect() { event=$1 when=$2 - negotiation=$3 echo "=== Check disconnect $when $event ===" echo - port=$(choose_tcp_port) - cat > "$TEST_DIR/nbd-fault-injector.conf" <"$TEST_DIR/nbd-fault-injector.out" 2>&1 & + + # Wait for server to be ready + while ! grep -q 'Listening on ' "$TEST_DIR/nbd-fault-injector.out"; do + sleep 0.1 + done + + # Extract the final address (port number has now been assigned in tcp case) + nbd_addr=$(sed 's/Listening on \(.*\)$/\1/' "$TEST_DIR/nbd-fault-injector.out") + + if [ "$proto" = "tcp" ]; then + nbd_url="nbd+tcp://$nbd_addr/$export_name" + else + nbd_url="nbd+unix:///$export_name?socket=$nbd_addr" fi - $PYTHON nbd-fault-injector.py $extra_args "127.0.0.1:$port" "$TEST_DIR/nbd-fault-injector.conf" >/dev/null 2>&1 & - wait_for_tcp_port "127\\.0\\.0\\.1:$port" $QEMU_IO -c "read 0 512" "$nbd_url" 2>&1 | _filter_qemu_io | _filter_nbd echo } -for event in neg1 "export" neg2 request reply data; do - for when in before after; do - check_disconnect "$event" "$when" - done - - # Also inject short replies from the NBD server - case "$event" in - neg1) - for when in 8 16; do - check_disconnect "$event" "$when" - done - ;; - "export") - for when in 4 12 16; do - check_disconnect "$event" "$when" +for proto in tcp unix; do + for event in neg1 "export" neg2 request reply data; do + for when in before after; do + check_disconnect "--$proto" "$event" "$when" done - ;; - neg2) - for when in 8 10; do - check_disconnect "$event" "$when" - done - ;; - reply) - for when in 4 8; do - check_disconnect "$event" "$when" - done - ;; - esac -done -# Also check classic negotiation without export information -for when in before 8 16 24 28 after; do - check_disconnect "neg-classic" "$when" --classic-negotiation + # Also inject short replies from the NBD server + case "$event" in + neg1) + for when in 8 16; do + check_disconnect "--$proto" "$event" "$when" + done + ;; + "export") + for when in 4 12 16; do + check_disconnect "--$proto" "$event" "$when" + done + ;; + neg2) + for when in 8 10; do + check_disconnect "--$proto" "$event" "$when" + done + ;; + reply) + for when in 4 8; do + check_disconnect "--$proto" "$event" "$when" + done + ;; + esac + done + + # Also check classic negotiation without export information + for when in before 8 16 24 28 after; do + check_disconnect "--$proto" --classic-negotiation "neg-classic" "$when" + done done # success, all done diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out index a24c6bfece..a7fb081889 100644 --- a/tests/qemu-iotests/083.out +++ b/tests/qemu-iotests/083.out @@ -1,43 +1,43 @@ QA output created by 083 === Check disconnect before neg1 === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect after neg1 === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect 8 neg1 === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect 16 neg1 === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect before export === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect after export === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect 4 export === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect 12 export === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect 16 export === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect before neg2 === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect after neg2 === @@ -45,11 +45,11 @@ read failed: Input/output error === Check disconnect 8 neg2 === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect 10 neg2 === -can't open device nbd:127.0.0.1:PORT:exportname=foo +can't open device nbd+tcp://127.0.0.1:PORT/foo === Check disconnect before request === @@ -88,23 +88,134 @@ read 512/512 bytes at offset 0 === Check disconnect before neg-classic === -can't open device nbd:127.0.0.1:PORT +can't open device nbd+tcp://127.0.0.1:PORT/ === Check disconnect 8 neg-classic === -can't open device nbd:127.0.0.1:PORT +can't open device nbd+tcp://127.0.0.1:PORT/ === Check disconnect 16 neg-classic === -can't open device nbd:127.0.0.1:PORT +can't open device nbd+tcp://127.0.0.1:PORT/ === Check disconnect 24 neg-classic === -can't open device nbd:127.0.0.1:PORT +can't open device nbd+tcp://127.0.0.1:PORT/ === Check disconnect 28 neg-classic === -can't open device nbd:127.0.0.1:PORT +can't open device nbd+tcp://127.0.0.1:PORT/ + +=== Check disconnect after neg-classic === + +read failed: Input/output error + +=== Check disconnect before neg1 === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect after neg1 === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect 8 neg1 === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect 16 neg1 === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect before export === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect after export === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect 4 export === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect 12 export === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect 16 export === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect before neg2 === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect after neg2 === + +read failed: Input/output error + +=== Check disconnect 8 neg2 === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect 10 neg2 === + +can't open device nbd+unix:///foo?socket=TEST_DIR/nbd.sock + +=== Check disconnect before request === + +read failed: Input/output error + +=== Check disconnect after request === + +read failed: Input/output error + +=== Check disconnect before reply === + +read failed: Input/output error + +=== Check disconnect after reply === + +read failed: Input/output error + +=== Check disconnect 4 reply === + +read failed +read failed: Input/output error + +=== Check disconnect 8 reply === + +read failed +read failed: Input/output error + +=== Check disconnect before data === + +read failed: Input/output error + +=== Check disconnect after data === + +read 512/512 bytes at offset 0 +512 bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec) + +=== Check disconnect before neg-classic === + +can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock + +=== Check disconnect 8 neg-classic === + +can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock + +=== Check disconnect 16 neg-classic === + +can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock + +=== Check disconnect 24 neg-classic === + +can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock + +=== Check disconnect 28 neg-classic === + +can't open device nbd+unix:///?socket=TEST_DIR/nbd.sock === Check disconnect after neg-classic === diff --git a/tests/qemu-iotests/common.filter b/tests/qemu-iotests/common.filter index 7a58e57317..9d5442ecd9 100644 --- a/tests/qemu-iotests/common.filter +++ b/tests/qemu-iotests/common.filter @@ -170,9 +170,9 @@ _filter_nbd() # # Filter out the TCP port number since this changes between runs. sed -e '/nbd\/.*\.c:/d' \ - -e 's#nbd:\(//\)\?127\.0\.0\.1:[0-9]*#nbd:\1127.0.0.1:PORT#g' \ + -e 's#127\.0\.0\.1:[0-9]*#127.0.0.1:PORT#g' \ -e "s#?socket=$TEST_DIR#?socket=TEST_DIR#g" \ - -e 's#\(exportname=foo\|PORT\): Failed to .*$#\1#' + -e 's#\(foo\|PORT/\?\|.sock\): Failed to .*$#\1#' } # make sure this script returns success -- cgit v1.2.3-55-g7522 From ab01df1fe21c013d1fd9e3f4c782430741c7dd33 Mon Sep 17 00:00:00 2001 From: Vladimir Sementsov-Ogievskiy Date: Fri, 4 Aug 2017 18:14:25 +0300 Subject: nbd/client: refactor nbd_read_eof Refactor nbd_read_eof to return 1 on success, 0 on eof, when no data was read and <0 for other cases, because returned size of read data is not actually used. Signed-off-by: Vladimir Sementsov-Ogievskiy Message-Id: <20170804151440.320927-3-vsementsov@virtuozzo.com> [eblake: tweak function comments, rebase to test 083 enhancements] Signed-off-by: Eric Blake --- nbd/client.c | 5 ----- nbd/nbd-internal.h | 33 ++++++++++++++++++++++++--------- tests/qemu-iotests/083.out | 8 ++++---- 3 files changed, 28 insertions(+), 18 deletions(-) (limited to 'tests') diff --git a/nbd/client.c b/nbd/client.c index f1c16b588f..4556056daa 100644 --- a/nbd/client.c +++ b/nbd/client.c @@ -925,11 +925,6 @@ ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp) return ret; } - if (ret != sizeof(buf)) { - error_setg(errp, "read failed"); - return -EINVAL; - } - /* Reply [ 0 .. 3] magic (NBD_REPLY_MAGIC) [ 4 .. 7] error (0 == no error) diff --git a/nbd/nbd-internal.h b/nbd/nbd-internal.h index 396ddb4d3e..03549e3f39 100644 --- a/nbd/nbd-internal.h +++ b/nbd/nbd-internal.h @@ -77,21 +77,36 @@ #define NBD_ESHUTDOWN 108 /* nbd_read_eof - * Tries to read @size bytes from @ioc. Returns number of bytes actually read. - * May return a value >= 0 and < size only on EOF, i.e. when iteratively called - * qio_channel_readv() returns 0. So, there is no need to call nbd_read_eof - * iteratively. + * Tries to read @size bytes from @ioc. + * Returns 1 on success + * 0 on eof, when no data was read (errp is not set) + * negative errno on failure (errp is set) */ -static inline ssize_t nbd_read_eof(QIOChannel *ioc, void *buffer, size_t size, - Error **errp) +static inline int nbd_read_eof(QIOChannel *ioc, void *buffer, size_t size, + Error **errp) { struct iovec iov = { .iov_base = buffer, .iov_len = size }; + ssize_t ret; + /* Sockets are kept in blocking mode in the negotiation phase. After * that, a non-readable socket simply means that another thread stole * our request/reply. Synchronization is done with recv_coroutine, so * that this is coroutine-safe. */ - return nbd_rwv(ioc, &iov, 1, size, true, errp); + + assert(size); + + ret = nbd_rwv(ioc, &iov, 1, size, true, errp); + if (ret <= 0) { + return ret; + } + + if (ret != size) { + error_setg(errp, "End of file"); + return -EINVAL; + } + + return 1; } /* nbd_read @@ -100,9 +115,9 @@ static inline ssize_t nbd_read_eof(QIOChannel *ioc, void *buffer, size_t size, static inline int nbd_read(QIOChannel *ioc, void *buffer, size_t size, Error **errp) { - ssize_t ret = nbd_read_eof(ioc, buffer, size, errp); + int ret = nbd_read_eof(ioc, buffer, size, errp); - if (ret >= 0 && ret != size) { + if (ret == 0) { ret = -EINVAL; error_setg(errp, "End of file"); } diff --git a/tests/qemu-iotests/083.out b/tests/qemu-iotests/083.out index a7fb081889..fb71b6f8ad 100644 --- a/tests/qemu-iotests/083.out +++ b/tests/qemu-iotests/083.out @@ -69,12 +69,12 @@ read failed: Input/output error === Check disconnect 4 reply === -read failed +End of file read failed: Input/output error === Check disconnect 8 reply === -read failed +End of file read failed: Input/output error === Check disconnect before data === @@ -180,12 +180,12 @@ read failed: Input/output error === Check disconnect 4 reply === -read failed +End of file read failed: Input/output error === Check disconnect 8 reply === -read failed +End of file read failed: Input/output error === Check disconnect before data === -- cgit v1.2.3-55-g7522