[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 1/7] docker.py: don't hang on large docker output
From: |
Sascha Silbe |
Subject: |
[Qemu-devel] [PATCH v2 1/7] docker.py: don't hang on large docker output |
Date: |
Wed, 24 Aug 2016 20:30:57 +0200 |
Unlike Popen.communicate(), subprocess.call() doesn't read from the
stdout file descriptor. If the child process produces more output than
fits into the pipe buffer, it will block indefinitely.
If we don't intend to consume the output, just send it straight to
/dev/null to avoid this issue.
Signed-off-by: Sascha Silbe <address@hidden>
Reviewed-by: Janosch Frank <address@hidden>
---
This fixes a hang for me when building the Ubuntu docker image (empty
docker image cache).
tests/docker/docker.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 222a105..efb2bf4 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -25,6 +25,10 @@ from tarfile import TarFile, TarInfo
from StringIO import StringIO
from shutil import copy, rmtree
+
+DEVNULL = open(os.devnull, 'wb')
+
+
def _text_checksum(text):
"""Calculate a digest string unique to the text content"""
return hashlib.sha1(text).hexdigest()
@@ -34,8 +38,7 @@ def _guess_docker_command():
commands = [["docker"], ["sudo", "-n", "docker"]]
for cmd in commands:
if subprocess.call(cmd + ["images"],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE) == 0:
+ stdout=DEVNULL, stderr=DEVNULL) == 0:
return cmd
commands_txt = "\n".join([" " + " ".join(x) for x in commands])
raise Exception("Cannot find working docker command. Tried:\n%s" % \
@@ -98,7 +101,7 @@ class Docker(object):
def _do(self, cmd, quiet=True, infile=None, **kwargs):
if quiet:
- kwargs["stdout"] = subprocess.PIPE
+ kwargs["stdout"] = DEVNULL
if infile:
kwargs["stdin"] = infile
return subprocess.call(self._command + cmd, **kwargs)
--
1.9.1
- [Qemu-devel] [PATCH v2 0/7] docker tests fixes, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 3/7] docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 4/7] docker: print warning if EXECUTABLE is not set when building debootstrap image, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 5/7] docker: make sure debootstrap is at least 1.0.67, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 7/7] docker: silence debootstrap when --quiet is given, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 1/7] docker.py: don't hang on large docker output,
Sascha Silbe <=
- [Qemu-devel] [PATCH v2 2/7] docker: avoid dependency on 'realpath' package, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 6/7] docker: build debootstrap after cloning, Sascha Silbe, 2016/08/24