ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <eblake@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Message-Id: <20170829122745.14309-3-stefanha@redhat.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Stefan Hajnoczi 2017-08-29 13:27:44 +01:00 committed by Eric Blake
parent 3c2d5183f9
commit 6e592fc922
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/qemu-iotests/nbd-fault-injector.py
View File

@ -235,11 +235,15 @@ def open_socket(path):
sock = socket.socket() sock = socket.socket()
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
sock.bind((host, int(port))) sock.bind((host, int(port)))
# If given port was 0 the final port number is now available
path = '%s:%d' % sock.getsockname()
else: else:
sock = socket.socket(socket.AF_UNIX) sock = socket.socket(socket.AF_UNIX)
sock.bind(path) sock.bind(path)
sock.listen(0) sock.listen(0)
print 'Listening on %s' % path print 'Listening on %s' % path
sys.stdout.flush() # another process may be waiting, show message now
return sock return sock
def usage(args): def usage(args):