[1/2] mesos git commit: Fixed a bug in 'ComposingContainerizerProcess::wait()'.

[ji...@apache.org]

Repository: mesos
Updated Branches:
  refs/heads/1.3.x 7c40f93f5 -> 8c88432d7


Fixed a bug in 'ComposingContainerizerProcess::wait()'.

Fixed a bug in the Composing Containerizer that would make it always
immediately return 'None' when trying to wait on a nested container
that had already been terminated and whose exit status was checkpointed.

Review: https://reviews.apache.org/r/59537/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/6b723a1b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/6b723a1b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/6b723a1b

Branch: refs/heads/1.3.x
Commit: 6b723a1b1815fe80f9a2db9878bb663f1e1e388e
Parents: 7c40f93
Author: Gastón Kleiman <ga...@mesosphere.io>
Authored: Tue May 30 13:50:06 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue May 30 13:51:25 2017 -0700

----------------------------------------------------------------------
 src/slave/containerizer/composing.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/6b723a1b/src/slave/containerizer/composing.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/composing.cpp b/src/slave/containerizer/composing.cpp
index 0b6c76b..f3c73d5 100644
--- a/src/slave/containerizer/composing.cpp
+++ b/src/slave/containerizer/composing.cpp
@@ -620,11 +620,19 @@ Future<ContainerStatus> ComposingContainerizerProcess::status(
 Future<Option<ContainerTermination>> ComposingContainerizerProcess::wait(
     const ContainerID& containerId)
 {
-  if (!containers_.contains(containerId)) {
+  // A nested container might have already been terminated, therefore
+  // `containers_` might not contain it, but its exit status might have
+  // been checkpointed.
+  //
+  // The containerizer that launched the root container should be able
+  // to retrieve the exit status even if it has been checkpointed.
+  const ContainerID rootContainerId = protobuf::getRootContainerId(containerId);
+
+  if (!containers_.contains(rootContainerId)) {
     return None();
   }
 
-  return containers_[containerId]->containerizer->wait(containerId);
+  return containers_[rootContainerId]->containerizer->wait(containerId);
 }
 
 

[2/2] mesos git commit: Added MESOS-7546 to 1.3.1 CHANGELOG.

[ji...@apache.org]

Added MESOS-7546 to 1.3.1 CHANGELOG.


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8c88432d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8c88432d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8c88432d

Branch: refs/heads/1.3.x
Commit: 8c88432d795d14ed115c542b1466a2c5839ca7fa
Parents: 6b723a1
Author: Jie Yu <yu...@gmail.com>
Authored: Tue May 30 13:56:55 2017 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Tue May 30 14:02:40 2017 -0700

----------------------------------------------------------------------
 CHANGELOG | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/8c88432d/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index 6b770ee..91c34d0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ All Issues:
 ** Bug
   * [MESOS-7429] - Allow isolators to inject task-specific environment variables.
   * [MESOS-7540] - Add an agent flag for executor re-registration timeout.
+  * [MESOS-7546] - WAIT_NESTED_CONTAINER sometimes returns 404.
   * [MESOS-7569] - Allow "old" executors with half-open connections to be preserved during agent upgrade / restart.