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 2015/12/19 01:35:26 UTC
[1/6] mesos git commit: Exposed partial contents of ContainerInfo
through the state endpoint.
Repository: mesos
Updated Branches:
refs/heads/master ca3667f4e -> 35e03dd72
Exposed partial contents of ContainerInfo through the state endpoint.
Review: https://reviews.apache.org/r/41423/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3fc7e83b
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3fc7e83b
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3fc7e83b
Branch: refs/heads/master
Commit: 3fc7e83be8851ce4f9f1b6d4ee60626154ea67b4
Parents: eb9f37d
Author: Artem Harutyunyan <ar...@mesosphere.io>
Authored: Fri Dec 18 16:10:32 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Dec 18 16:35:18 2015 -0800
----------------------------------------------------------------------
src/common/http.cpp | 8 ++++++
.../docker_containerizer_tests.cpp | 26 +++++++++++++++++++-
2 files changed, 33 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/3fc7e83b/src/common/http.cpp
----------------------------------------------------------------------
diff --git a/src/common/http.cpp b/src/common/http.cpp
index 5198650..2ecb78c 100644
--- a/src/common/http.cpp
+++ b/src/common/http.cpp
@@ -265,6 +265,10 @@ JSON::Object model(const Task& task)
object.values["discovery"] = JSON::protobuf(task.discovery());
}
+ if (task.has_container()) {
+ object.values["container"] = JSON::protobuf(task.container());
+ }
+
return object;
}
@@ -367,6 +371,10 @@ JSON::Object model(
object.values["discovery"] = JSON::protobuf(task.discovery());
}
+ if (task.has_container()) {
+ object.values["container"] = JSON::protobuf(task.container());
+ }
+
return object;
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/3fc7e83b/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index 3f199e6..452a021 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -471,9 +471,33 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
EXPECT_EQ(TASK_RUNNING, statusRunning.get().state());
ASSERT_TRUE(statusRunning.get().has_data());
- Try<JSON::Array> parse = JSON::parse<JSON::Array>(statusRunning.get().data());
+ Try<JSON::Array> array = JSON::parse<JSON::Array>(statusRunning.get().data());
+ ASSERT_SOME(array);
+
+ // Check if container information is exposed through master's state endpoint.
+ Future<http::Response> response = http::get(master.get(), "state");
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response);
+
+ Try<JSON::Object> parse = JSON::parse<JSON::Object>(response.get().body);
ASSERT_SOME(parse);
+ Result<JSON::Value> find = parse.get().find<JSON::Value>(
+ "frameworks[0].tasks[0].container.docker.privileged");
+
+ EXPECT_SOME_EQ(false, find);
+
+ // Check if container information is exposed through slave's state endpoint.
+ response = http::get(slave.get(), "state");
+ AWAIT_EXPECT_RESPONSE_STATUS_EQ(process::http::OK().status, response);
+
+ parse = JSON::parse<JSON::Object>(response.get().body);
+ ASSERT_SOME(parse);
+
+ find = parse.get().find<JSON::Value>(
+ "frameworks[0].executors[0].tasks[0].container.docker.privileged");
+
+ EXPECT_SOME_EQ(false, find);
+
// Now verify that the Docker.NetworkSettings.IPAddress label is
// present.
// TODO(karya): Deprecated -- Remove after 0.25.0 has shipped.
[6/6] mesos git commit: Removed deprecated code.
Posted by ji...@apache.org.
Removed deprecated code.
Review: https://reviews.apache.org/r/41571/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/35e03dd7
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/35e03dd7
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/35e03dd7
Branch: refs/heads/master
Commit: 35e03dd72d852f5066fb28700c5c62b845c5e1c8
Parents: 0ec4fdd
Author: Artem Harutyunyan <ar...@mesosphere.io>
Authored: Fri Dec 18 16:10:40 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Dec 18 16:35:19 2015 -0800
----------------------------------------------------------------------
src/tests/containerizer/docker_containerizer_tests.cpp | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/35e03dd7/src/tests/containerizer/docker_containerizer_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/docker_containerizer_tests.cpp b/src/tests/containerizer/docker_containerizer_tests.cpp
index 452a021..a43e355 100644
--- a/src/tests/containerizer/docker_containerizer_tests.cpp
+++ b/src/tests/containerizer/docker_containerizer_tests.cpp
@@ -498,14 +498,6 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Launch)
EXPECT_SOME_EQ(false, find);
- // Now verify that the Docker.NetworkSettings.IPAddress label is
- // present.
- // TODO(karya): Deprecated -- Remove after 0.25.0 has shipped.
- ASSERT_TRUE(statusRunning.get().has_labels());
- EXPECT_EQ(1, statusRunning.get().labels().labels().size());
- EXPECT_EQ("Docker.NetworkSettings.IPAddress",
- statusRunning.get().labels().labels(0).key());
-
// Now verify that the TaskStatus contains the container IP address.
ASSERT_TRUE(statusRunning.get().has_container_status());
EXPECT_EQ(1, statusRunning.get().container_status().network_infos().size());
[3/6] mesos git commit: Removed manual construction of Task in master.
Posted by ji...@apache.org.
Removed manual construction of Task in master.
Review: https://reviews.apache.org/r/41422/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/eb9f37d9
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/eb9f37d9
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/eb9f37d9
Branch: refs/heads/master
Commit: eb9f37d92dd0c7214b6c81e5c04a081200c42b2f
Parents: 7a5ff03
Author: Artem Harutyunyan <ar...@mesosphere.io>
Authored: Fri Dec 18 16:10:27 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Dec 18 16:35:18 2015 -0800
----------------------------------------------------------------------
src/master/master.cpp | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/eb9f37d9/src/master/master.cpp
----------------------------------------------------------------------
diff --git a/src/master/master.cpp b/src/master/master.cpp
index 470b542..3ceab51 100644
--- a/src/master/master.cpp
+++ b/src/master/master.cpp
@@ -2899,7 +2899,6 @@ Resources Master::addTask(
// Determine if this task launches an executor, and if so make sure
// the slave and framework state has been updated accordingly.
- Option<ExecutorID> executorId;
if (task.has_executor()) {
// TODO(benh): Refactor this code into Slave::addTask.
@@ -2914,29 +2913,10 @@ Resources Master::addTask(
resources += task.executor().resources();
}
-
- executorId = task.executor().executor_id();
}
// Add the task to the framework and slave.
- Task* t = new Task();
- t->mutable_framework_id()->MergeFrom(framework->id());
- t->set_state(TASK_STAGING);
- t->set_name(task.name());
- t->mutable_task_id()->MergeFrom(task.task_id());
- t->mutable_slave_id()->MergeFrom(task.slave_id());
- t->mutable_resources()->MergeFrom(task.resources());
-
- if (executorId.isSome()) {
- t->mutable_executor_id()->MergeFrom(executorId.get());
- }
-
- if (task.has_labels()) {
- t->mutable_labels()->MergeFrom(task.labels());
- }
- if (task.has_discovery()) {
- t->mutable_discovery()->MergeFrom(task.discovery());
- }
+ Task* t = new Task(protobuf::createTask(task, TASK_STAGING, framework->id()));
slave->addTask(t);
framework->addTask(t);
[4/6] mesos git commit: Modified ptotobuf::createTask to use
ContainerInfo from internal Task protobuf.
Posted by ji...@apache.org.
Modified ptotobuf::createTask to use ContainerInfo from internal Task
protobuf.
Review: https://reviews.apache.org/r/41421/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/7a5ff039
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/7a5ff039
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/7a5ff039
Branch: refs/heads/master
Commit: 7a5ff03960a245b9ee812b8880f95b102cc67d7f
Parents: cb937c7
Author: Artem Harutyunyan <ar...@mesosphere.io>
Authored: Fri Dec 18 16:10:22 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Dec 18 16:35:18 2015 -0800
----------------------------------------------------------------------
src/common/protobuf_utils.cpp | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/7a5ff039/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 6e1eb0b..277e8ad 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -174,6 +174,10 @@ Task createTask(
t.mutable_discovery()->MergeFrom(task.discovery());
}
+ if (task.has_container()) {
+ t.mutable_container()->CopyFrom(task.container());
+ }
+
return t;
}
[2/6] mesos git commit: Added ContainerInfo to internal Task protobuf.
Posted by ji...@apache.org.
Added ContainerInfo to internal Task protobuf.
Review: https://reviews.apache.org/r/41420/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cb937c7d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cb937c7d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cb937c7d
Branch: refs/heads/master
Commit: cb937c7dba1f8791dd32becca4c1cc705a69ebf7
Parents: ca3667f
Author: Artem Harutyunyan <ar...@mesosphere.io>
Authored: Fri Dec 18 16:10:18 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Dec 18 16:35:18 2015 -0800
----------------------------------------------------------------------
src/messages/messages.proto | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cb937c7d/src/messages/messages.proto
----------------------------------------------------------------------
diff --git a/src/messages/messages.proto b/src/messages/messages.proto
index b66bac1..e0f1fca 100644
--- a/src/messages/messages.proto
+++ b/src/messages/messages.proto
@@ -35,8 +35,8 @@ package mesos.internal;
* 1) we need additional IDs, such as a specific
* framework, executor, or agent; or
* 2) we do not need the additional data, such as the command run by the
- * task, the specific containerization, or health checks. These
- * additional fields may be large and unnecessary for some Mesos messages.
+ * task or the health checks. These additional fields may be large and
+ * unnecessary for some Mesos messages.
*
* `Task` is generally constructed from a `TaskInfo`. See protobuf::createTask.
*/
@@ -63,6 +63,9 @@ message Task {
// to use this information as needed and to handle tasks without
// service discovery information.
optional DiscoveryInfo discovery = 12;
+
+ // Container information for the task.
+ optional ContainerInfo container = 13;
}
[5/6] mesos git commit: Changed MergeFrom() to CopyFrom() in
protobuf::createTask().
Posted by ji...@apache.org.
Changed MergeFrom() to CopyFrom() in protobuf::createTask().
Review: https://reviews.apache.org/r/41426/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0ec4fddc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0ec4fddc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0ec4fddc
Branch: refs/heads/master
Commit: 0ec4fddc4a103200e0c512d533eae5f5fc0e08bc
Parents: 3fc7e83
Author: Artem Harutyunyan <ar...@mesosphere.io>
Authored: Fri Dec 18 16:10:37 2015 -0800
Committer: Jie Yu <yu...@gmail.com>
Committed: Fri Dec 18 16:35:19 2015 -0800
----------------------------------------------------------------------
src/common/protobuf_utils.cpp | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0ec4fddc/src/common/protobuf_utils.cpp
----------------------------------------------------------------------
diff --git a/src/common/protobuf_utils.cpp b/src/common/protobuf_utils.cpp
index 277e8ad..155e4d8 100644
--- a/src/common/protobuf_utils.cpp
+++ b/src/common/protobuf_utils.cpp
@@ -155,12 +155,12 @@ Task createTask(
const FrameworkID& frameworkId)
{
Task t;
- t.mutable_framework_id()->MergeFrom(frameworkId);
+ t.mutable_framework_id()->CopyFrom(frameworkId);
t.set_state(state);
t.set_name(task.name());
- t.mutable_task_id()->MergeFrom(task.task_id());
- t.mutable_slave_id()->MergeFrom(task.slave_id());
- t.mutable_resources()->MergeFrom(task.resources());
+ t.mutable_task_id()->CopyFrom(task.task_id());
+ t.mutable_slave_id()->CopyFrom(task.slave_id());
+ t.mutable_resources()->CopyFrom(task.resources());
if (task.has_executor()) {
t.mutable_executor_id()->CopyFrom(task.executor().executor_id());
@@ -171,7 +171,7 @@ Task createTask(
}
if (task.has_discovery()) {
- t.mutable_discovery()->MergeFrom(task.discovery());
+ t.mutable_discovery()->CopyFrom(task.discovery());
}
if (task.has_container()) {