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 2016/04/23 00:26:13 UTC
[2/2] mesos git commit: Fixed isolator cleaup issue when destroying a
provisioning container.
Fixed isolator cleaup issue when destroying a provisioning container.
Review: https://reviews.apache.org/r/46577/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/653eca74
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/653eca74
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/653eca74
Branch: refs/heads/master
Commit: 653eca74f1080f5f55cd5092423506163e65d402
Parents: 3a5dcfe
Author: Gilbert Song <so...@gmail.com>
Authored: Fri Apr 22 15:26:04 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Apr 22 15:26:04 2016 -0700
----------------------------------------------------------------------
src/slave/containerizer/mesos/containerizer.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/653eca74/src/slave/containerizer/mesos/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp
index e92b9b5..133c0fe 100644
--- a/src/slave/containerizer/mesos/containerizer.cpp
+++ b/src/slave/containerizer/mesos/containerizer.cpp
@@ -1486,9 +1486,10 @@ void MesosContainerizerProcess::destroy(
await(container->provisionInfos)
.onAny(defer(
self(),
- &Self::___destroy,
+ &Self::____destroy,
containerId,
None(),
+ list<Future<Nothing>>(),
"Container destroyed while provisioning images"));
return;