mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-14 15:02:54 +00:00
nbd patches for 2017-08-30
- Kashyap Chamarthy: qemu-iotests: Extend non-shared storage migration test (194) - Stefan Hajnaczi: 0/3 nbd-client: enter read_reply_co during init to avoid crash - Vladimir Sementsov-Ogievskiy: portions of 0/17 nbd client refactoring and fixing -----BEGIN PGP SIGNATURE----- Comment: Public key at http://people.redhat.com/eblake/eblake.gpg iQEcBAABCAAGBQJZpv4CAAoJEKeha0olJ0NqpLYH/3jX5h8r4kc4AcJYeS4FXHri pHWJIvbcVfw59eLM6RmGdRxAGfVk9cQHyo1O90Rym8/KWNo4BRz15AlVG/F6gqO2 9BgQZ7I/J0HViV2RrKWDR6btkcnAFabmHt8oeUKQHc60jBWL+8xtlcfdlnwvABVs V7MPv27vZJKVPgku2i1jTDpYu65vKAPxGw8hly3qAkMXQuYnP0K0WkN6ihHgmx1F CEZ99GUfeNExk+71tN6ULV77rtR1E0iQnsrK2mBuYhgIhveJ8wYiqb4flDnlqHfm G7hvpyCAScDhIfEbMAV5K38VCRTJU/XK3x2FNljSAcZa0X1UTX+qprl0zhY9ENk= =XaJp -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/ericb/tags/pull-nbd-2017-08-30' into staging nbd patches for 2017-08-30 - Kashyap Chamarthy: qemu-iotests: Extend non-shared storage migration test (194) - Stefan Hajnaczi: 0/3 nbd-client: enter read_reply_co during init to avoid crash - Vladimir Sementsov-Ogievskiy: portions of 0/17 nbd client refactoring and fixing # gpg: Signature made Wed 30 Aug 2017 19:03:46 BST # gpg: using RSA key 0xA7A16B4A2527436A # gpg: Good signature from "Eric Blake <eblake@redhat.com>" # gpg: aka "Eric Blake (Free Software Programmer) <ebb9@byu.net>" # gpg: aka "[jpeg image of size 6874]" # Primary key fingerprint: 71C2 CC22 B1C4 6029 27D2 F3AA A7A1 6B4A 2527 436A * remotes/ericb/tags/pull-nbd-2017-08-30: block/nbd-client: refactor request send/receive block/nbd-client: rename nbd_recv_coroutines_enter_all block/nbd-client: get rid of ssize_t nbd/client: fix nbd_send_request to return int nbd/client: refactor nbd_receive_reply nbd/client: refactor nbd_read_eof nbd/client: fix nbd_opt_go qemu-iotests: test NBD over UNIX domain sockets in 083 qemu-iotests: improve nbd-fault-injector.py startup protocol nbd-client: avoid read_reply_co entry if send failed qemu-iotests: Extend non-shared storage migration test (194) Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
2e75021eb6
|
|
@ -34,7 +34,7 @@
|
|||
#define HANDLE_TO_INDEX(bs, handle) ((handle) ^ ((uint64_t)(intptr_t)bs))
|
||||
#define INDEX_TO_HANDLE(bs, index) ((index) ^ ((uint64_t)(intptr_t)bs))
|
||||
|
||||
static void nbd_recv_coroutines_enter_all(NBDClientSession *s)
|
||||
static void nbd_recv_coroutines_wake_all(NBDClientSession *s)
|
||||
{
|
||||
int i;
|
||||
|
||||
|
|
@ -112,7 +112,7 @@ static coroutine_fn void nbd_read_reply_entry(void *opaque)
|
|||
}
|
||||
|
||||
s->quit = true;
|
||||
nbd_recv_coroutines_enter_all(s);
|
||||
nbd_recv_coroutines_wake_all(s);
|
||||
s->read_reply_co = NULL;
|
||||
}
|
||||
|
||||
|
|
@ -144,12 +144,12 @@ static int nbd_co_send_request(BlockDriverState *bs,
|
|||
request->handle = INDEX_TO_HANDLE(s, i);
|
||||
|
||||
if (s->quit) {
|
||||
qemu_co_mutex_unlock(&s->send_mutex);
|
||||
return -EIO;
|
||||
rc = -EIO;
|
||||
goto err;
|
||||
}
|
||||
if (!s->ioc) {
|
||||
qemu_co_mutex_unlock(&s->send_mutex);
|
||||
return -EPIPE;
|
||||
rc = -EPIPE;
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (qiov) {
|
||||
|
|
@ -166,8 +166,13 @@ static int nbd_co_send_request(BlockDriverState *bs,
|
|||
} else {
|
||||
rc = nbd_send_request(s->ioc, request);
|
||||
}
|
||||
|
||||
err:
|
||||
if (rc < 0) {
|
||||
s->quit = true;
|
||||
s->requests[i].coroutine = NULL;
|
||||
s->in_flight--;
|
||||
qemu_co_queue_next(&s->free_sema);
|
||||
}
|
||||
qemu_co_mutex_unlock(&s->send_mutex);
|
||||
return rc;
|
||||
|
|
@ -201,13 +206,6 @@ static void nbd_co_receive_reply(NBDClientSession *s,
|
|||
/* Tell the read handler to read another header. */
|
||||
s->reply.handle = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static void nbd_coroutine_end(BlockDriverState *bs,
|
||||
NBDRequest *request)
|
||||
{
|
||||
NBDClientSession *s = nbd_get_client_session(bs);
|
||||
int i = HANDLE_TO_INDEX(s, request->handle);
|
||||
|
||||
s->requests[i].coroutine = NULL;
|
||||
|
||||
|
|
@ -222,29 +220,40 @@ static void nbd_coroutine_end(BlockDriverState *bs,
|
|||
qemu_co_mutex_unlock(&s->send_mutex);
|
||||
}
|
||||
|
||||
static int nbd_co_request(BlockDriverState *bs,
|
||||
NBDRequest *request,
|
||||
QEMUIOVector *qiov)
|
||||
{
|
||||
NBDClientSession *client = nbd_get_client_session(bs);
|
||||
NBDReply reply;
|
||||
int ret;
|
||||
|
||||
assert(!qiov || request->type == NBD_CMD_WRITE ||
|
||||
request->type == NBD_CMD_READ);
|
||||
ret = nbd_co_send_request(bs, request,
|
||||
request->type == NBD_CMD_WRITE ? qiov : NULL);
|
||||
if (ret < 0) {
|
||||
reply.error = -ret;
|
||||
} else {
|
||||
nbd_co_receive_reply(client, request, &reply,
|
||||
request->type == NBD_CMD_READ ? qiov : NULL);
|
||||
}
|
||||
return -reply.error;
|
||||
}
|
||||
|
||||
int nbd_client_co_preadv(BlockDriverState *bs, uint64_t offset,
|
||||
uint64_t bytes, QEMUIOVector *qiov, int flags)
|
||||
{
|
||||
NBDClientSession *client = nbd_get_client_session(bs);
|
||||
NBDRequest request = {
|
||||
.type = NBD_CMD_READ,
|
||||
.from = offset,
|
||||
.len = bytes,
|
||||
};
|
||||
NBDReply reply;
|
||||
ssize_t ret;
|
||||
|
||||
assert(bytes <= NBD_MAX_BUFFER_SIZE);
|
||||
assert(!flags);
|
||||
|
||||
ret = nbd_co_send_request(bs, &request, NULL);
|
||||
if (ret < 0) {
|
||||
reply.error = -ret;
|
||||
} else {
|
||||
nbd_co_receive_reply(client, &request, &reply, qiov);
|
||||
}
|
||||
nbd_coroutine_end(bs, &request);
|
||||
return -reply.error;
|
||||
return nbd_co_request(bs, &request, qiov);
|
||||
}
|
||||
|
||||
int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,
|
||||
|
|
@ -256,8 +265,6 @@ int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,
|
|||
.from = offset,
|
||||
.len = bytes,
|
||||
};
|
||||
NBDReply reply;
|
||||
ssize_t ret;
|
||||
|
||||
if (flags & BDRV_REQ_FUA) {
|
||||
assert(client->info.flags & NBD_FLAG_SEND_FUA);
|
||||
|
|
@ -266,27 +273,18 @@ int nbd_client_co_pwritev(BlockDriverState *bs, uint64_t offset,
|
|||
|
||||
assert(bytes <= NBD_MAX_BUFFER_SIZE);
|
||||
|
||||
ret = nbd_co_send_request(bs, &request, qiov);
|
||||
if (ret < 0) {
|
||||
reply.error = -ret;
|
||||
} else {
|
||||
nbd_co_receive_reply(client, &request, &reply, NULL);
|
||||
}
|
||||
nbd_coroutine_end(bs, &request);
|
||||
return -reply.error;
|
||||
return nbd_co_request(bs, &request, qiov);
|
||||
}
|
||||
|
||||
int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,
|
||||
int bytes, BdrvRequestFlags flags)
|
||||
{
|
||||
ssize_t ret;
|
||||
NBDClientSession *client = nbd_get_client_session(bs);
|
||||
NBDRequest request = {
|
||||
.type = NBD_CMD_WRITE_ZEROES,
|
||||
.from = offset,
|
||||
.len = bytes,
|
||||
};
|
||||
NBDReply reply;
|
||||
|
||||
if (!(client->info.flags & NBD_FLAG_SEND_WRITE_ZEROES)) {
|
||||
return -ENOTSUP;
|
||||
|
|
@ -300,22 +298,13 @@ int nbd_client_co_pwrite_zeroes(BlockDriverState *bs, int64_t offset,
|
|||
request.flags |= NBD_CMD_FLAG_NO_HOLE;
|
||||
}
|
||||
|
||||
ret = nbd_co_send_request(bs, &request, NULL);
|
||||
if (ret < 0) {
|
||||
reply.error = -ret;
|
||||
} else {
|
||||
nbd_co_receive_reply(client, &request, &reply, NULL);
|
||||
}
|
||||
nbd_coroutine_end(bs, &request);
|
||||
return -reply.error;
|
||||
return nbd_co_request(bs, &request, NULL);
|
||||
}
|
||||
|
||||
int nbd_client_co_flush(BlockDriverState *bs)
|
||||
{
|
||||
NBDClientSession *client = nbd_get_client_session(bs);
|
||||
NBDRequest request = { .type = NBD_CMD_FLUSH };
|
||||
NBDReply reply;
|
||||
ssize_t ret;
|
||||
|
||||
if (!(client->info.flags & NBD_FLAG_SEND_FLUSH)) {
|
||||
return 0;
|
||||
|
|
@ -324,14 +313,7 @@ int nbd_client_co_flush(BlockDriverState *bs)
|
|||
request.from = 0;
|
||||
request.len = 0;
|
||||
|
||||
ret = nbd_co_send_request(bs, &request, NULL);
|
||||
if (ret < 0) {
|
||||
reply.error = -ret;
|
||||
} else {
|
||||
nbd_co_receive_reply(client, &request, &reply, NULL);
|
||||
}
|
||||
nbd_coroutine_end(bs, &request);
|
||||
return -reply.error;
|
||||
return nbd_co_request(bs, &request, NULL);
|
||||
}
|
||||
|
||||
int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
|
||||
|
|
@ -342,22 +324,12 @@ int nbd_client_co_pdiscard(BlockDriverState *bs, int64_t offset, int bytes)
|
|||
.from = offset,
|
||||
.len = bytes,
|
||||
};
|
||||
NBDReply reply;
|
||||
ssize_t ret;
|
||||
|
||||
if (!(client->info.flags & NBD_FLAG_SEND_TRIM)) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
ret = nbd_co_send_request(bs, &request, NULL);
|
||||
if (ret < 0) {
|
||||
reply.error = -ret;
|
||||
} else {
|
||||
nbd_co_receive_reply(client, &request, &reply, NULL);
|
||||
}
|
||||
nbd_coroutine_end(bs, &request);
|
||||
return -reply.error;
|
||||
|
||||
return nbd_co_request(bs, &request, NULL);
|
||||
}
|
||||
|
||||
void nbd_client_detach_aio_context(BlockDriverState *bs)
|
||||
|
|
|
|||
|
|
@ -163,8 +163,8 @@ int nbd_receive_negotiate(QIOChannel *ioc, const char *name,
|
|||
Error **errp);
|
||||
int nbd_init(int fd, QIOChannelSocket *sioc, NBDExportInfo *info,
|
||||
Error **errp);
|
||||
ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request);
|
||||
ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp);
|
||||
int nbd_send_request(QIOChannel *ioc, NBDRequest *request);
|
||||
int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp);
|
||||
int nbd_client(int fd);
|
||||
int nbd_disconnect(int fd);
|
||||
|
||||
|
|
|
|||
21
nbd/client.c
21
nbd/client.c
|
|
@ -399,12 +399,10 @@ static int nbd_opt_go(QIOChannel *ioc, const char *wantname,
|
|||
phase, but make sure it sent flags */
|
||||
if (len) {
|
||||
error_setg(errp, "server sent invalid NBD_REP_ACK");
|
||||
nbd_send_opt_abort(ioc);
|
||||
return -1;
|
||||
}
|
||||
if (!info->flags) {
|
||||
error_setg(errp, "broken server omitted NBD_INFO_EXPORT");
|
||||
nbd_send_opt_abort(ioc);
|
||||
return -1;
|
||||
}
|
||||
trace_nbd_opt_go_success();
|
||||
|
|
@ -898,7 +896,7 @@ int nbd_disconnect(int fd)
|
|||
}
|
||||
#endif
|
||||
|
||||
ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request)
|
||||
int nbd_send_request(QIOChannel *ioc, NBDRequest *request)
|
||||
{
|
||||
uint8_t buf[NBD_REQUEST_SIZE];
|
||||
|
||||
|
|
@ -916,22 +914,22 @@ ssize_t nbd_send_request(QIOChannel *ioc, NBDRequest *request)
|
|||
return nbd_write(ioc, buf, sizeof(buf), NULL);
|
||||
}
|
||||
|
||||
ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)
|
||||
/* nbd_receive_reply
|
||||
* Returns 1 on success
|
||||
* 0 on eof, when no data was read (errp is not set)
|
||||
* negative errno on failure (errp is set)
|
||||
*/
|
||||
int nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)
|
||||
{
|
||||
uint8_t buf[NBD_REPLY_SIZE];
|
||||
uint32_t magic;
|
||||
ssize_t ret;
|
||||
int ret;
|
||||
|
||||
ret = nbd_read_eof(ioc, buf, sizeof(buf), errp);
|
||||
if (ret <= 0) {
|
||||
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)
|
||||
|
|
@ -955,6 +953,7 @@ ssize_t nbd_receive_reply(QIOChannel *ioc, NBDReply *reply, Error **errp)
|
|||
error_setg(errp, "invalid magic (got 0x%" PRIx32 ")", magic);
|
||||
return -EINVAL;
|
||||
}
|
||||
return sizeof(buf);
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
done
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
event=$1
|
||||
when=$2
|
||||
negotiation=$3
|
||||
echo "=== Check disconnect $when $event ==="
|
||||
echo
|
||||
|
||||
port=$(choose_tcp_port)
|
||||
|
||||
cat > "$TEST_DIR/nbd-fault-injector.conf" <<EOF
|
||||
[inject-error]
|
||||
event=$event
|
||||
when=$when
|
||||
EOF
|
||||
|
||||
if [ "$negotiation" = "--classic-negotiation" ]; then
|
||||
extra_args=--classic-negotiation
|
||||
nbd_url="nbd:127.0.0.1:$port"
|
||||
if [ "$proto" = "tcp" ]; then
|
||||
nbd_addr="127.0.0.1:0"
|
||||
else
|
||||
nbd_url="nbd:127.0.0.1:$port:exportname=foo"
|
||||
nbd_addr="$TEST_DIR/nbd.sock"
|
||||
fi
|
||||
|
||||
rm -f "$TEST_DIR/nbd.sock"
|
||||
|
||||
$PYTHON nbd-fault-injector.py $extra_args "$nbd_addr" "$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"
|
||||
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
|
||||
|
||||
# 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 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"
|
||||
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 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
|
||||
|
|
|
|||
|
|
@ -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 ===
|
||||
|
||||
|
|
@ -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 ===
|
||||
|
|
@ -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 ===
|
||||
|
||||
End of file
|
||||
read failed: Input/output error
|
||||
|
||||
=== Check disconnect 8 reply ===
|
||||
|
||||
End of file
|
||||
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 ===
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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': {}}
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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):
|
||||
|
|
|
|||
Loading…
Reference in a new issue