You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ab...@apache.org on 2019/04/30 12:10:36 UTC
[mesos] branch 1.8.x updated (6160315 -> b032d4e)
This is an automated email from the ASF dual-hosted git repository.
abudnik pushed a change to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/mesos.git.
from 6160315 Added MESOS-9536 to the 1.8.1 CHANGELOG.
new 02f532a Removed the duplicate pid check in Docker containerizer.
new b032d4e Added MESOS-9695 to the 1.8.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 | 2 +-
src/slave/containerizer/docker.cpp | 27 ++++++---------------------
2 files changed, 7 insertions(+), 22 deletions(-)
[mesos] 02/02: Added MESOS-9695 to the 1.8.1 CHANGELOG.
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abudnik pushed a commit to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit b032d4ec81c76277b274150f8027766f0e3d2275
Author: Andrei Budnik <ab...@mesosphere.com>
AuthorDate: Tue Apr 30 14:08:58 2019 +0200
Added MESOS-9695 to the 1.8.1 CHANGELOG.
---
CHANGELOG | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG b/CHANGELOG
index d19085d..c99523c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@ Release Notes - Mesos - Version 1.8.1 (WIP)
** Bug
* [MESOS-9536] - Nested container launched with non-root user may not be able to write to its sandbox via the environment variable `MESOS_SANDBOX`.
-
+ * [MESOS-9695] - Remove the duplicate pid check in Docker containerizer
Release Notes - Mesos - Version 1.8.0
-------------------------------------
[mesos] 01/02: Removed the duplicate pid check in Docker
containerizer.
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
abudnik pushed a commit to branch 1.8.x
in repository https://gitbox.apache.org/repos/asf/mesos.git
commit 02f532ae876196c0c8abad9d6effb75d3ffa5db7
Author: Qian Zhang <zh...@gmail.com>
AuthorDate: Tue Apr 30 13:59:54 2019 +0200
Removed the duplicate pid check in Docker containerizer.
Review: https://reviews.apache.org/r/70561/
---
src/slave/containerizer/docker.cpp | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 7f1d471..e4ad945 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -936,10 +936,6 @@ Future<Nothing> DockerContainerizerProcess::_recover(
}
}
- // Collection of pids that we've started reaping in order to
- // detect very unlikely duplicate scenario (see below).
- hashmap<ContainerID, pid_t> pids;
-
foreachvalue (const FrameworkState& framework, state->frameworks) {
foreachvalue (const ExecutorState& executor, framework.executors) {
if (executor.info.isNone()) {
@@ -1018,9 +1014,12 @@ Future<Nothing> DockerContainerizerProcess::_recover(
// Only reap the executor process if the executor can be connected
// otherwise just set `container->status` to `None()`. This is to
- // avoid reaping an irrelevant process, e.g., after the agent host is
- // rebooted, the executor pid happens to be reused by another process.
- // See MESOS-8125 for details.
+ // avoid reaping an irrelevant process, e.g., agent process is stopped
+ // for a long time, and during this time executor terminates and its
+ // pid happens to be reused by another irrelevant process. When agent
+ // is restarted, it still considers this executor not complete (i.e.,
+ // `run->completed` is false), so we would reap the irrelevant process
+ // if we do not check whether that process can be connected.
// Note that if both the pid and the port of the executor are reused
// by another process or two processes respectively after the agent
// host reboots we will still reap an irrelevant process, but that
@@ -1056,20 +1055,6 @@ Future<Nothing> DockerContainerizerProcess::_recover(
container->status.future()
->onAny(defer(self(), &Self::reaped, containerId));
- if (pids.contains_value(pid)) {
- // This should (almost) never occur. There is the
- // possibility that a new executor is launched with the same
- // pid as one that just exited (highly unlikely) and the
- // slave dies after the new executor is launched but before
- // it hears about the termination of the earlier executor
- // (also unlikely).
- return Failure(
- "Detected duplicate pid " + stringify(pid) +
- " for container " + stringify(containerId));
- }
-
- pids.put(containerId, pid);
-
const string sandboxDirectory = paths::getExecutorRunPath(
flags.work_dir,
state->id,