You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by gi...@apache.org on 2017/08/11 23:27:05 UTC
[1/2] mesos git commit: Added MESOS-6950 to 1.3.2 CHANGELOG.
Repository: mesos
Updated Branches:
refs/heads/1.3.x f2deb04a5 -> 08c431677
Added MESOS-6950 to 1.3.2 CHANGELOG.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/08c43167
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/08c43167
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/08c43167
Branch: refs/heads/1.3.x
Commit: 08c4316770951696f57e757d963929b91a4f65bd
Parents: d612597
Author: Gilbert Song <so...@gmail.com>
Authored: Fri Aug 11 16:21:40 2017 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Fri Aug 11 16:26:49 2017 -0700
----------------------------------------------------------------------
CHANGELOG | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/08c43167/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 5257d33..a3ba2a0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -5,6 +5,7 @@ Release Notes - Mesos - Version 1.3.2 (WIP)
All Issues:
** Bug
* [MESOS-6743] - Docker executor hangs forever if `docker stop` fails.
+ * [MESOS-6950] - Launching two tasks with the same Docker image simultaneously may cause a staging dir never cleaned up.
Release Notes - Mesos - Version 1.3.1
[2/2] mesos git commit: Created staging dir only when needed.
Posted by gi...@apache.org.
Created staging dir only when needed.
Created staging dir only when needed.
Review: https://reviews.apache.org/r/61546/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d6125979
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d6125979
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d6125979
Branch: refs/heads/1.3.x
Commit: d6125979278451c1de5bc549ed24d069122ef270
Parents: f2deb04
Author: Qian Zhang <zh...@gmail.com>
Authored: Fri Aug 11 15:53:55 2017 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Fri Aug 11 16:26:49 2017 -0700
----------------------------------------------------------------------
.../mesos/provisioner/docker/store.cpp | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d6125979/src/slave/containerizer/mesos/provisioner/docker/store.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/provisioner/docker/store.cpp b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
index 68ce265..74e17ad 100644
--- a/src/slave/containerizer/mesos/provisioner/docker/store.cpp
+++ b/src/slave/containerizer/mesos/provisioner/docker/store.cpp
@@ -249,18 +249,19 @@ Future<Image> StoreProcess::_get(
}
}
- Try<string> staging =
- os::mkdtemp(paths::getStagingTempDir(flags.docker_store_dir));
-
- if (staging.isError()) {
- return Failure("Failed to create a staging directory: " + staging.error());
- }
-
- // If there is already an pulling going on for the given 'name', we
+ // If there is already a pulling going on for the given 'name', we
// will skip the additional pulling.
const string name = stringify(reference);
if (!pulling.contains(name)) {
+ Try<string> staging =
+ os::mkdtemp(paths::getStagingTempDir(flags.docker_store_dir));
+
+ if (staging.isError()) {
+ return Failure(
+ "Failed to create a staging directory: " + staging.error());
+ }
+
Owned<Promise<Image>> promise(new Promise<Image>());
Future<Image> future = puller->pull(reference, staging.get(), backend)