You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2018/08/28 16:10:37 UTC
[mesos] branch 1.7.x updated (66561d5 -> 3bf79a7)
This is an automated email from the ASF dual-hosted git repository.
alexr pushed a change to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from 66561d5 Added MESOS-9177 to the 1.7.0 CHANGELOG.
new 1660a05 Cleaned up container on launch failures in composing containerizer.
new 3bf79a7 Added MESOS-9185 to the 1.7.1 CHANGELOG.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG | 8 ++++++++
src/slave/containerizer/composing.cpp | 5 +++++
2 files changed, 13 insertions(+)
[mesos] 01/02: Cleaned up container on launch failures in composing
containerizer.
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexr pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 1660a0552e58ba4407180508f7e4eeed2050b2a2
Author: Andrei Budnik <ab...@mesosphere.com>
AuthorDate: Tue Aug 28 16:47:04 2018 +0200
Cleaned up container on launch failures in composing containerizer.
Previously, if a parent container was unknown to the composing
containerizer during an attempt to launch a nested container
via `ComposingContainerizerProcess::launch()`, the composing
containerizer returned an error without cleaning up the container.
The `containerizer` field was uninitialized, so a further attempt
to remove or destroy the nested container led to segfault.
This patch removes the container when the parent container is unknown.
Review: https://reviews.apache.org/r/68235/
(cherry picked from commit 5fbfb8da5ad62c40752fa7b7e0a0842c892f6857)
---
src/slave/containerizer/composing.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp
index 5216458..d854794 100644
--- a/src/slave/containerizer/composing.cpp
+++ b/src/slave/containerizer/composing.cpp
@@ -445,6 +445,11 @@ Future<Containerizer::LaunchResult> ComposingContainerizerProcess::launch(
if (containerId.has_parent()) {
ContainerID rootContainerId = protobuf::getRootContainerId(containerId);
if (!containers_.contains(rootContainerId)) {
+ // We do cleanup here, otherwise we cannot remove or destroy the nested
+ // container due to its undefined `containerizer` field.
+ containers_.erase(containerId);
+ delete container;
+
return Failure(
"Root container " + stringify(rootContainerId) + " not found");
}
[mesos] 02/02: Added MESOS-9185 to the 1.7.1 CHANGELOG.
Posted by al...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
alexr pushed a commit to branch 1.7.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 3bf79a73093b09cd7dcf477cacd749bfe7ed4358
Author: Alexander Rukletsov <al...@apache.org>
AuthorDate: Tue Aug 28 18:10:26 2018 +0200
Added MESOS-9185 to the 1.7.1 CHANGELOG.
---
CHANGELOG | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/CHANGELOG b/CHANGELOG
index b06e4aa..1110506 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Release Notes - Mesos - Version 1.7.1 (WIP)
+-------------------------------------------
+* This is a bug fix release.
+
+** Bug
+ * [MESOS-9185] - An attempt to remove or destroy container in composing containerizer leads to segfault.
+
+
Release Notes - Mesos - Version 1.7.0
-------------------------------------------
This release contains the following highlights: