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 2018/06/19 07:02:44 UTC
[1/2] mesos git commit: Added Cai ShuHua to the contributor list.
Repository: mesos
Updated Branches:
refs/heads/master 00ce78bd7 -> d46bd330f
Added Cai ShuHua to the contributor list.
Review: https://reviews.apache.org/r/67558/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c11918fb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c11918fb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c11918fb
Branch: refs/heads/master
Commit: c11918fbf9fea92bd5fec0ecf8d8dcefd2376894
Parents: 00ce78b
Author: cai shuhua <ca...@163.com>
Authored: Mon Jun 18 23:55:26 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Mon Jun 18 23:55:26 2018 -0700
----------------------------------------------------------------------
docs/contributors.yaml | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/c11918fb/docs/contributors.yaml
----------------------------------------------------------------------
diff --git a/docs/contributors.yaml b/docs/contributors.yaml
index 6a5b215..c46795a 100644
--- a/docs/contributors.yaml
+++ b/docs/contributors.yaml
@@ -207,6 +207,14 @@
jira_user: bmerry
reviewboard_user: bmerry
+- name: Cai ShuHua
+ affiliations:
+ - {organization: asiainfo}
+ emails:
+ - caishuhua916@163.com
+ jira_user: caishuhua916
+ reviewboard_user: caishuhua916
+
- name: Charles Allen
affiliations:
- {organization: Metamarkets}
[2/2] mesos git commit: Fixed a potential unsafe access to Container
struct.
Posted by gi...@apache.org.
Fixed a potential unsafe access to Container struct.
This patch adds guard to the Container struct in docker
containerizer.
Review: https://reviews.apache.org/r/67585/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d46bd330
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d46bd330
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d46bd330
Branch: refs/heads/master
Commit: d46bd330f8c17b2dc0305432a2a2134b425811a0
Parents: c11918f
Author: CHEN RUNCONG <ch...@163.com>
Authored: Tue Jun 19 00:01:27 2018 -0700
Committer: Gilbert Song <so...@gmail.com>
Committed: Tue Jun 19 00:01:27 2018 -0700
----------------------------------------------------------------------
src/slave/containerizer/docker.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/d46bd330/src/slave/containerizer/docker.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp
index 391700f..f83036a 100644
--- a/src/slave/containerizer/docker.cpp
+++ b/src/slave/containerizer/docker.cpp
@@ -1380,6 +1380,11 @@ Future<Docker::Container> DockerContainerizerProcess::launchExecutorContainer(
return Failure("Container is already destroyed");
}
+ if (containers_[containerId]->state == Container::DESTROYING) {
+ return Failure(
+ "Container is being destroyed during launching excutor container");
+ }
+
Container* container = containers_.at(containerId);
container->state = Container::RUNNING;
@@ -1470,6 +1475,11 @@ Future<pid_t> DockerContainerizerProcess::launchExecutorProcess(
return Failure("Container is already destroyed");
}
+ if (containers_[containerId]->state == Container::DESTROYING) {
+ return Failure(
+ "Container is being destroyed during launching executor process");
+ }
+
Container* container = containers_.at(containerId);
container->state = Container::RUNNING;