From: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
To: "qemu-devel@nongnu.org" <qemu-devel@nongnu.org>,
"qemu-block@nongnu.org" <qemu-block@nongnu.org>
Cc: "kwolf@redhat.com" <kwolf@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Denis Lunev <den@virtuozzo.com>,
"mreitz@redhat.com" <mreitz@redhat.com>
Subject: Re: [PATCH] iotests: Test nbd client reconnect
Date: Mon, 28 Oct 2019 08:48:51 +0000 [thread overview]
Message-ID: <f6677fb5-d4fd-f29b-27cd-6b58cdd14bc5@virtuozzo.com> (raw)
In-Reply-To: <1572187725-685325-1-git-send-email-andrey.shinkevich@virtuozzo.com>
On 27/10/2019 17:48, Andrey Shinkevich wrote:
> The stress test for an NBD client. The NBD server is disconnected after
> a client write operation. The NBD client should reconnect and retry the
> operation.
>
> Suggested-by: Denis V. Lunev <den@openvz.org>
> Signed-off-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
> ---
> tests/qemu-iotests/277 | 91 ++++++++++++++++++++++++++++++++++++++++++++++
> tests/qemu-iotests/277.out | 7 ++++
> tests/qemu-iotests/group | 1 +
> 3 files changed, 99 insertions(+)
> create mode 100755 tests/qemu-iotests/277
> create mode 100644 tests/qemu-iotests/277.out
>
> diff --git a/tests/qemu-iotests/277 b/tests/qemu-iotests/277
> new file mode 100755
> index 0000000..46a29b7
> --- /dev/null
> +++ b/tests/qemu-iotests/277
> @@ -0,0 +1,91 @@
> +#!/usr/bin/env python
> +#
> +# Test nbd client reconnect
> +#
> +# Copyright (c) 2019 Virtuozzo International GmbH
> +#
> +# 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/>.
> +#
> +
> +import os
> +import sys
> +import io
> +import subprocess
> +import iotests
> +from iotests import file_path, log
> +
> +
> +def start_server_NBD(nbd_sock, conf_file):
> + srv = subprocess.Popen(["nbd-fault-injector.py", "--classic-negotiation",
> + nbd_sock, conf_file], stdout=subprocess.PIPE,
> + stderr=subprocess.STDOUT, universal_newlines=True)
> + line = srv.stdout.readline()
> + if "Listening on " in line:
> + log('NBD server: started')
> + else:
> + log('NBD server: {}'.format(line.rstrip()))
> +
> + return srv
> +
> +
> +def check_server_NBD(srv):
> + exitcode = srv.wait(timeout=10)
> +
> + if exitcode < 0:
> + sys.stderr.write('NBD server: ERROR %i\n' % (-exitcode))
> + log(srv.communicate()[0])
> + else:
> + line = srv.stdout.readline()
> + log('NBD server: ' + line.rstrip())
> +
> + os.remove(nbd_sock)
> + os.remove(conf_file)
> +
> +
> +def make_conf_file(conf_file, event):
> + if os.path.exists(conf_file):
> + os.remove(conf_file)
> +
> + with open(conf_file, "w+") as conff:
> + conff.write("[inject-error]\nevent={}\nwhen=after".format(event))
> +
> +
> +disk, nbd_sock = file_path('disk', 'nbd-sock')
The 'disk' is going to be remooved as a construction waste.
> +nbd_uri = 'nbd+unix:///?socket=' + nbd_sock
> +if os.path.exists(nbd_sock):
> + os.remove(nbd_sock)
> +
> +conf_file = os.path.join(iotests.test_dir, "nbd-fault-injector.conf")
> +make_conf_file(conf_file, "data")
> +srv = start_server_NBD(nbd_sock, conf_file)
> +
> +log('NBD client: QEMU-IO write')
> +args = iotests.qemu_io_args + ['-f', 'raw', '-c', 'write -P 0x7 0 3M', nbd_uri]
> +clt = subprocess.Popen(args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
> +
> +check_server_NBD(srv)
> +
> +make_conf_file(conf_file, "reply")
> +srv = start_server_NBD(nbd_sock, conf_file)
> +
> +exitcode = clt.wait(timeout=10)
> +if exitcode < 0:
> + sys.stderr.write('qemu-io received signal %i: %s\n' %
> + (-exitcode, ' '.join(args)))
> +
> +for line in io.TextIOWrapper(clt.stdout, encoding="utf-8"):
> + if "3 MiB" not in line:
> + log('NBD client: ' + line.rstrip())
> +
> +check_server_NBD(srv)
> diff --git a/tests/qemu-iotests/277.out b/tests/qemu-iotests/277.out
> new file mode 100644
> index 0000000..07e6e82
> --- /dev/null
> +++ b/tests/qemu-iotests/277.out
> @@ -0,0 +1,7 @@
> +NBD server: started
> +NBD client: QEMU-IO write
> +NBD server: Closing connection on rule match inject-error
> +NBD server: started
> +NBD client: Connection closed
> +NBD client: wrote 3145728/3145728 bytes at offset 0
> +NBD server: Closing connection on rule match inject-error
> diff --git a/tests/qemu-iotests/group b/tests/qemu-iotests/group
> index af322af..22ef1b8 100644
> --- a/tests/qemu-iotests/group
> +++ b/tests/qemu-iotests/group
> @@ -282,3 +282,4 @@
> 267 rw auto quick snapshot
> 268 rw auto quick
> 270 rw backing quick
> +277 rw
>
--
With the best regards,
Andrey Shinkevich
prev parent reply other threads:[~2019-10-28 8:50 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-27 14:48 [PATCH] iotests: Test nbd client reconnect Andrey Shinkevich
2019-10-28 7:55 ` Eric Blake
2019-10-28 10:17 ` Vladimir Sementsov-Ogievskiy
2019-10-28 10:18 ` Andrey Shinkevich
2019-10-28 8:48 ` Andrey Shinkevich [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f6677fb5-d4fd-f29b-27cd-6b58cdd14bc5@virtuozzo.com \
--to=andrey.shinkevich@virtuozzo.com \
--cc=den@virtuozzo.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).