You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2018/06/08 05:28:40 UTC
mesos git commit: Used /dev/null in Docker::__pull to avoid deadlock.
Repository: mesos
Updated Branches:
refs/heads/master 5e1d8627b -> c855fbb4a
Used /dev/null in Docker::__pull to avoid deadlock.
Avoids deadlock between docker pull and mesos-slave when output from
docker pull > pipe buffer allocated by the kernel.
Review: https://reviews.apache.org/r/67489/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c855fbb4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c855fbb4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c855fbb4
Branch: refs/heads/master
Commit: c855fbb4accf675c35b46a86383c9da153c0ce32
Parents: 5e1d862
Author: Kjetil Joergensen <kj...@gmail.com>
Authored: Thu Jun 7 13:13:37 2018 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Thu Jun 7 22:17:32 2018 -0700
----------------------------------------------------------------------
src/docker/docker.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c855fbb4/src/docker/docker.cpp
----------------------------------------------------------------------
diff --git a/src/docker/docker.cpp b/src/docker/docker.cpp
index 1332d4b..c6db244 100644
--- a/src/docker/docker.cpp
+++ b/src/docker/docker.cpp
@@ -1766,7 +1766,7 @@ Future<Docker::Image> Docker::__pull(
path,
argv,
Subprocess::PATH(os::DEV_NULL),
- Subprocess::PIPE(),
+ Subprocess::PATH(os::DEV_NULL),
Subprocess::PIPE(),
nullptr,
environment);