iotests: Let 233 run concurrently
v2 cover iotests: Let 233 run concurrently
Currently, 233 cannot reliably run concurrently to other NBD TCP tests. When it starts, it looks for a free port and then attempts to use that for the whole duration of the test run. This is a TOCTTOU race
condition: It does not reserve that port, so another NBD TCP test that runs in parallel can grab it.
To fix this, we must not use the same port all the time, but always choose a new one when qemu-nbd is started. We cannot check whether it is free, but must let qemu-nbd do so and take it atomically. We can achieve this by using the existing --fork option.
There are two problems with --fork, however. First, it does not give us a chance to reliably get the server’s PID, which we need. We can change that by letting qemu-nbd (optionally) write a PID file, though. (Which makes sense if we have a daemon mode.)
Second, it currently discards all output after the server has been started. That looks like an accident to me, because we clearly try to restore the old stderr channel after having redirected all startup messages to the parent process. If it is a bug, we can fix it.
v2:
- Patch 1:
- Use qemu_write_pidfile() [Dan]
- %s/pid_path/pid_filename/ [Eric]
- Patch 4: Drop the now superfluous subshell [Eric]
(Didn’t touch _qemu_img_wrapper, because, well, it doesn’t belong in this series?)
- Patch 5:
- s/racey/racy/ [Eric]
- Unite the “rm -f”s [Eric]
(Did not address the “FIFO filling up” problem, because 64 kB of FIFO space ought to be enough. Also, cat-ing around that felt weird.)
git backport-diff against v1:
Key:
[----] : patches are identical
[####] : number of functional differences between upstream/downstream patch [down] : patch is downstream-only
The flags [FC] indicate (F)unctional and (C)ontextual differences, respectively
001/5:[0025] [FC] 'qemu-nbd: Add --pid-file option' 002/5:[----] [--] 'iotests.py: Add qemu_nbd_early_pipe()' 003/5:[----] [--] 'qemu-nbd: Do not close stderr' 004/5:[0006] [FC] 'iotests: Use qemu-nbd's --pid-file' 005/5:[0003] [FC] 'iotests: Let 233 run concurrently'
Max Reitz (5):
qemu-nbd: Add --pid-file option
iotests.py: Add qemu_nbd_early_pipe()
qemu-nbd: Do not close stderr
iotests: Use qemu-nbd's --pid-file
iotests: Let 233 run concurrently
qemu-nbd.c | 15 +++++- qemu-nbd.texi | 2 + tests/qemu-iotests/147 | 4 +- tests/qemu-iotests/233 | 1 - tests/qemu-iotests/common.nbd | 94 ++++++++++++++++------------------- tests/qemu-iotests/common.rc | 6 +-- tests/qemu-iotests/iotests.py | 9 ++-- 7 files changed, 68 insertions(+), 63 deletions(-)
Signature · 1 line
2.20.1
PATCH v2 1/5 qemu-nbd: Add --pid-file option
--fork is a bit boring if there is no way to get the child's PID. This option helps.
--- qemu-nbd.c | 12 ++++++++++++ qemu-nbd.texi | 2 ++ 2 files changed, 14 insertions(+)
qemu-nbd.c +12 -0
@@ -59,6 +59,7 @@#define QEMU_NBD_OPT_IMAGE_OPTS 262#define QEMU_NBD_OPT_FORK 263#define QEMU_NBD_OPT_TLSAUTHZ 264 +#define QEMU_NBD_OPT_PID_FILE 265#define MBR_SIZE 512
@@ -111,6 +112,7 @@ static void usage(const char *name)" specify tracing options\n" " --fork fork off the server process and exit the parent\n" " once the server is running\n" +" --pid-file=PATH store the server's process ID in the given file\n" #if HAVE_NBD_DEVICE"\n" "Kernel NBD client support:\n"
@@ -651,6 +653,7 @@ int main(int argc, char **argv) { "image-opts", no_argument, NULL, QEMU_NBD_OPT_IMAGE_OPTS }, { "trace", required_argument, NULL, 'T' }, { "fork", no_argument, NULL, QEMU_NBD_OPT_FORK }, + { "pid-file", required_argument, NULL, QEMU_NBD_OPT_PID_FILE }, { NULL, 0, NULL, 0 } };int ch;
@@ -677,6 +680,8 @@ int main(int argc, char **argv)bool list = false;int old_stderr =-1 ;unsigned socket_activation; +const char *pid_file_name =NULL ; +FILE *pid_file;/* The client thread uses SIGTERM to interrupt the server. A signal * handler ensures that "qemu-nbd -v -c" exits with a nice status code.
@@ -876,6 +881,9 @@ int main(int argc, char **argv)case 'L' : list = true;break ; +case QEMU_NBD_OPT_PID_FILE : + pid_file_name = optarg; +break ; } }
@@ -1196,6 +1204,10 @@ int main(int argc, char **argv)nbd_update_server_watch (); +if (pid_file_name) { +qemu_write_pidfile (pid_file_name, &error_fatal); + } +/* now when the initialization is (almost) complete, chdir("/") * to free any busy filesystems */ if (chdir ("/" ) <0 ) {
qemu-nbd.texi +2 -0
@@ -117,6 +117,8 @@ option; or provide the credentials needed for connecting as a client in list mode. @item --fork Fork off the server process and exit the parent once the server is running. +@item --pid-file=PATH +Store the server's process ID in the given file. @item --tls-authz=ID Specify the ID of a qauthz object previously created with the --object option. This will be used to authorize connecting users
Signature · 1 line
2.20.1
Re: [Qemu-devel] [PATCH v2 1/5] qemu-nbd: Add --pid-file option
Quoted 13 lines · Max Reitz
--fork is a bit boring if there is no way to get the child's PID. This option helps.
Signed-off-by Max Reitz <[email protected]>--- qemu-nbd.c | 12 ++++++++++++ qemu-nbd.texi | 2 ++ 2 files changed, 14 insertions(+)qemu-nbd.c +0
-0
[...]
qemu-nbd.c int main(int argc, char **argv) · line 684
Quoted 6 lines
qemu-nbd.c +2
-0@@ -677,6 +680,8 @@ int main(int argc, char **argv)bool list = false;int old_stderr =-1 ;unsigned socket_activation; +const char *pid_file_name =NULL ; +FILE *pid_file;
Great to see how well I test my patches. This shouldn’t be here anymore, of course.
Max
PATCH v2 2/5 iotests.py: Add qemu_nbd_early_pipe()
In reply to Max Reitzqemu_nbd_pipe() currently unconditionally reads qemu-nbd's output. That is not ideal because qemu-nbd may keep stderr open after the parent process has exited.
Currently, the only user of qemu_nbd_pipe() is 147, which discards the whole output if the parent process returned success and only evaluates it on error. Therefore, we can replace qemu_nbd_pipe() by qemu_nbd_early_pipe() that does the same: Discard the output on success, and return it on error.
--- tests/qemu-iotests/147 | 4 ++-- tests/qemu-iotests/iotests.py | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-)
tests/qemu-iotests/147 +2 -2
@@ -24,7 +24,7 @@ import socket import stat import time import iotests -from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_pipe +from iotests import cachemode, imgfmt, qemu_img, qemu_nbd, qemu_nbd_early_pipe NBD_PORT_START = 32768 NBD_PORT_END = NBD_PORT_START + 1024
@@ -93,7 +93,7 @@ class QemuNBD(NBDBlockdevAddBase): pass def _try_server_up(self, *args): - status, msg = qemu_nbd_pipe('-f', imgfmt, test_img, *args) + status, msg = qemu_nbd_early_pipe('-f', imgfmt, test_img, *args) if status == 0: return True if 'Address already in use' in msg:
tests/qemu-iotests/iotests.py +6 -3
@@ -204,9 +204,9 @@ def qemu_nbd(*args): '''Run qemu-nbd in daemon mode and return the parent's exit code''' return subprocess.call(qemu_nbd_args + ['--fork'] + list(args)) -def qemu_nbd_pipe(*args): +def qemu_nbd_early_pipe(*args): '''Run qemu-nbd in daemon mode and return both the parent's exit code - and its output''' + and its output in case of an error''' subp = subprocess.Popen(qemu_nbd_args + ['--fork'] + list(args), stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
@@ -216,7 +216,10 @@ def qemu_nbd_pipe(*args): sys.stderr.write('qemu-nbd received signal %i: %s\n' % (-exitcode, ' '.join(qemu_nbd_args + ['--fork'] + list(args)))) - return exitcode, subp.communicate()[0] + if exitcode == 0: + return exitcode, '' + else: + return exitcode, subp.communicate()[0] def compare_images(img1, img2, fmt1=imgfmt, fmt2=imgfmt): '''Return True if two image files are identical'''
Signature · 1 line
2.20.1
PATCH v2 3/5 qemu-nbd: Do not close stderr
In reply to Max ReitzWe kept old_stderr specifically so we could keep emitting error message on stderr. However, qemu_daemon() closes stderr. Therefore, we need to dup() stderr to old_stderr before invoking qemu_daemon().
--- qemu-nbd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
qemu-nbd.c +2 -1
@@ -1015,10 +1015,11 @@ int main(int argc, char **argv)exit (EXIT_FAILURE ); }else if (pid ==0 ) {close (stderr_fd[0 ]); + + old_stderr =dup (STDERR_FILENO ); ret =qemu_daemon (1 ,0 );/* Temporarily redirect stderr to the parent's pipe... */ - old_stderr =dup (STDERR_FILENO );dup2 (stderr_fd[1 ],STDERR_FILENO );if (ret <0 ) {error_report ("Failed to daemonize: %s" ,strerror (errno));
Signature · 1 line
2.20.1
PATCH v2 4/5 iotests: Use qemu-nbd's --pid-file
In reply to Max Reitz--- tests/qemu-iotests/common.rc | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
tests/qemu-iotests/common.rc +2 -4
@@ -105,10 +105,8 @@ _qemu_io_wrapper() _qemu_nbd_wrapper() { - ( - echo $BASHPID > "${QEMU_TEST_DIR}/qemu-nbd.pid" - exec "$QEMU_NBD_PROG" $QEMU_NBD_OPTIONS "$@" - ) + "$QEMU_NBD_PROG" --pid-file="${QEMU_TEST_DIR}/qemu-nbd.pid" \ + $QEMU_NBD_OPTIONS "$@" } _qemu_vxhs_wrapper()
Signature · 1 line
2.20.1
PATCH v2 5/5 iotests: Let 233 run concurrently
In reply to Max Reitzcommon.nbd's nbd_server_set_tcp_port() tries to find a free port, and then uses it for the whole test run. However, this is racy because even if the port was free at the beginning, there is no guarantee it will continue to be available. Therefore, 233 currently cannot reliably be run concurrently with other NBD TCP tests.
This patch addresses the problem by dropping nbd_server_set_tcp_port(), and instead finding a new port every time nbd_server_start_tcp_socket() is invoked. For this, we run qemu-nbd with --fork and on error evaluate the output to see whether it contains "Address already in use". If so, we try the next port.
On success, we still want to continually redirect the output from qemu-nbd to stderr. To achieve both, we redirect qemu-nbd's stderr to a FIFO that we then open in bash. If the parent process exits with status 0 (which means that the server has started successfully), we launch a background cat process that copies the FIFO to stderr. On failure, we read the whole content into a variable and then evaluate it.
While at it, use --fork in nbd_server_start_unix_socket(), too. Doing so allows us to drop nbd_server_wait_for_*_socket().
Note that the reason common.nbd did not use --fork before is that qemu-nbd did not have --pid-file.
--- tests/qemu-iotests/233 | 1 - tests/qemu-iotests/common.nbd | 94 ++++++++++++++++------------------- 2 files changed, 42 insertions(+), 53 deletions(-)
tests/qemu-iotests/233 +0 -1
@@ -50,7 +50,6 @@ _supported_proto file _supported_os Linux _require_command QEMU_NBD -nbd_server_set_tcp_port tls_x509_init echo
tests/qemu-iotests/common.nbd +42 -52
125 lines not on this page · raw message
Signature · 1 line
2.20.1