You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2014/04/18 20:55:32 UTC
git commit: Added containerizer.proto.
Repository: mesos
Updated Branches:
refs/heads/master 388e19959 -> 0d5c80386
Added containerizer.proto.
Adds containerizer.proto containing protobuf message definitions for
"Launch", "Update" and "Termination". All of those are used in the
upcoming External Containerizer. These protos are defined within
their own C++ namespace: "containerizer".
Replaced slave::Containerizer::Termination with the
containerizer::Termination protobuf, gaining a serializable
Termination message.
The protoc results are added towards the Python Egg
(containerizer_pb2.py) and the Java package
(ContainerizerProtos.java).
Review: https://reviews.apache.org/r/20141
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/0d5c8038
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/0d5c8038
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/0d5c8038
Branch: refs/heads/master
Commit: 0d5c80386787d5ff4f29d071d63d1d4052fb877d
Parents: 388e199
Author: Till Toenshoff <to...@me.com>
Authored: Thu Apr 17 20:37:44 2014 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Fri Apr 18 11:55:10 2014 -0700
----------------------------------------------------------------------
include/mesos/containerizer/containerizer.hpp | 25 ++++++++
include/mesos/containerizer/containerizer.proto | 63 ++++++++++++++++++++
include/mesos/mesos.hpp.in | 2 +-
src/Makefile.am | 58 ++++++++++++++----
src/slave/containerizer/containerizer.hpp | 25 ++------
src/slave/containerizer/mesos_containerizer.cpp | 24 ++++----
src/slave/containerizer/mesos_containerizer.hpp | 6 +-
src/slave/slave.cpp | 14 ++---
src/slave/slave.hpp | 2 +-
src/tests/containerizer.cpp | 13 ++--
src/tests/containerizer.hpp | 4 +-
11 files changed, 173 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/include/mesos/containerizer/containerizer.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/containerizer/containerizer.hpp b/include/mesos/containerizer/containerizer.hpp
new file mode 100644
index 0000000..9bf76e0
--- /dev/null
+++ b/include/mesos/containerizer/containerizer.hpp
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __CONTAINERIZER_PROTO_HPP__
+#define __CONTAINERIZER_PROTO_HPP__
+
+// ONLY USEFUL AFTER RUNNING PROTOC.
+#include <mesos/containerizer/containerizer.pb.h>
+
+#endif // __CONTAINERIZER_PROTO_HPP__
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/include/mesos/containerizer/containerizer.proto
----------------------------------------------------------------------
diff --git a/include/mesos/containerizer/containerizer.proto b/include/mesos/containerizer/containerizer.proto
new file mode 100644
index 0000000..6ecd82e
--- /dev/null
+++ b/include/mesos/containerizer/containerizer.proto
@@ -0,0 +1,63 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import "mesos.proto";
+
+package mesos.containerizer;
+
+option java_package = "org.apache.mesos.containerizer";
+option java_outer_classname = "Protos";
+
+
+/**
+ * Information about a containerized task launch, sent by slave to the containerizer.
+ */
+message Launch {
+ required ContainerID container_id = 1;
+ required TaskInfo task = 2;
+ optional FrameworkID framework_id = 3;
+ optional string directory = 4;
+ optional string user = 5;
+ optional SlaveID slave_id = 6;
+ optional string slave_pid = 7;
+ optional bool checkpoint = 8;
+ optional string mesos_executor_path = 9;
+}
+
+
+/**
+ * Information about a containerizer update, sent by slave to the containerizer.
+ */
+message Update {
+ required ContainerID container_id = 1;
+ repeated Resource resources = 2;
+}
+
+
+/**
+ * Information about a container termination, returned by the containerizer to the slave.
+ */
+message Termination {
+ // A container may be killed if it exceeds its resources; this will be
+ // indicated by killed=true and described by the message string.
+ required bool killed = 1;
+ required string message = 2;
+
+ // Exit status of the process.
+ optional int32 status = 3;
+}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/include/mesos/mesos.hpp.in
----------------------------------------------------------------------
diff --git a/include/mesos/mesos.hpp.in b/include/mesos/mesos.hpp.in
index 2d4310c..8aedf8c 100644
--- a/include/mesos/mesos.hpp.in
+++ b/include/mesos/mesos.hpp.in
@@ -19,7 +19,7 @@
#ifndef __MESOS_HPP__
#define __MESOS_HPP__
-#include <mesos.pb.h> // ONLY USEFUL AFTER RUNNING PROTOC.
+#include <mesos/mesos.pb.h> // ONLY USEFUL AFTER RUNNING PROTOC.
#define MESOS_VERSION "@PACKAGE_VERSION@"
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/Makefile.am
----------------------------------------------------------------------
diff --git a/src/Makefile.am b/src/Makefile.am
index 560b4c7..9e715bf 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -103,9 +103,20 @@ endif
MESOS_PROTO = $(top_srcdir)/include/mesos/mesos.proto
-CXX_PROTOS = mesos.pb.cc mesos.pb.h
-JAVA_PROTOS = java/generated/org/apache/mesos/Protos.java
-PYTHON_PROTOS = python/src/mesos_pb2.py
+CONTAINERIZER_PROTO = \
+ $(top_srcdir)/include/mesos/containerizer/containerizer.proto
+
+CXX_PROTOS = \
+ mesos.pb.cc mesos.pb.h \
+ containerizer/containerizer.pb.cc containerizer/containerizer.pb.h
+
+JAVA_PROTOS = \
+ java/generated/org/apache/mesos/Protos.java \
+ java/generated/org/apache/mesos/containerizer/Protos.java
+
+PYTHON_PROTOS = \
+ python/src/mesos_pb2.py \
+ python/src/containerizer_pb2.py
BUILT_SOURCES += $(CXX_PROTOS) $(JAVA_PROTOS) $(PYTHON_PROTOS)
CLEANFILES += $(CXX_PROTOS) $(JAVA_PROTOS) $(PYTHON_PROTOS)
@@ -135,18 +146,32 @@ CLEANFILES += $(REGISTRY_PROTOS)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --cpp_out=. $^
+containerizer/%.pb.cc containerizer/%.pb.h: $(CONTAINERIZER_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --cpp_out=. $^
+
%.pb.cc %.pb.h: %.proto
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --cpp_out=. $^
-$(JAVA_PROTOS): $(MESOS_PROTO)
+java/generated/org/apache/mesos/Protos.java: $(MESOS_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
-$(PYTHON_PROTOS): $(MESOS_PROTO)
+java/generated/org/apache/mesos/containerizer/Protos.java: \
+ $(CONTAINERIZER_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) $(PROTOCFLAGS) --java_out=java/generated $^
+
+python/src/mesos_pb2.py: $(MESOS_PROTO)
$(MKDIR_P) $(@D)
$(PROTOC) $(PROTOCFLAGS) --python_out=python/src $^
+python/src/containerizer_pb2.py: $(CONTAINERIZER_PROTO)
+ $(MKDIR_P) $(@D)
+ $(PROTOC) -I$(top_srcdir)/include/mesos/containerizer \
+ $(PROTOCFLAGS) --python_out=python/src $^
+
# We even use a convenience library for most of Mesos so that we can
# exclude third party libraries so setuptools/distribute can build a
# self-contained Python library and statically link in the third party
@@ -202,13 +227,19 @@ libmesos_no_3rdparty_la_SOURCES = \
zookeeper/group.cpp \
messages/messages.proto
-pkginclude_HEADERS = $(top_srcdir)/include/mesos/executor.hpp \
- $(top_srcdir)/include/mesos/scheduler.hpp \
- $(top_srcdir)/include/mesos/resources.hpp \
- $(top_srcdir)/include/mesos/values.hpp \
- $(top_srcdir)/include/mesos/mesos.proto
+pkginclude_HEADERS = \
+ $(top_srcdir)/include/mesos/executor.hpp \
+ $(top_srcdir)/include/mesos/scheduler.hpp \
+ $(top_srcdir)/include/mesos/resources.hpp \
+ $(top_srcdir)/include/mesos/values.hpp \
+ $(top_srcdir)/include/mesos/mesos.proto \
+ $(top_srcdir)/include/mesos/containerizer/containerizer.proto
-nodist_pkginclude_HEADERS = ../include/mesos/mesos.hpp mesos.pb.h
+nodist_pkginclude_HEADERS = \
+ $(top_srcdir)/include/mesos/mesos.hpp \
+ mesos.pb.h \
+ $(top_srcdir)/include/mesos/containerizer/containerizer.hpp \
+ containerizer/containerizer.pb.h
if OS_LINUX
libmesos_no_3rdparty_la_SOURCES += linux/cgroups.cpp
@@ -371,7 +402,8 @@ libmesos_no_3rdparty_la_LIBADD += libstate.la
# The final result!
lib_LTLIBRARIES += libmesos.la
-libmesos_la_SOURCES = $(MESOS_PROTO) # Include as part of the distribution.
+# Include as part of the distribution.
+libmesos_la_SOURCES = $(MESOS_PROTO) $(CONTAINERIZER_PROTO)
libmesos_la_LDFLAGS = -release $(PACKAGE_VERSION) -shared
@@ -652,7 +684,7 @@ libjava_la_CPPFLAGS = $(MESOS_CPPFLAGS)
libjava_la_CPPFLAGS += $(JAVA_CPPFLAGS)
libjava_la_CPPFLAGS += -I$(srcdir)/java/jni -Ijava/jni
-libjava_la_DEPENDENCIES = $(MESOS_PROTO)
+libjava_la_DEPENDENCIES = $(MESOS_PROTO) $(CONTAINERIZER_PROTO)
libjava_la_LIBADD = $(JAVA_LDFLAGS)
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/slave/containerizer/containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/containerizer.hpp b/src/slave/containerizer/containerizer.hpp
index d9ae326..9c5af54 100644
--- a/src/slave/containerizer/containerizer.hpp
+++ b/src/slave/containerizer/containerizer.hpp
@@ -24,6 +24,8 @@
#include <mesos/mesos.hpp>
#include <mesos/resources.hpp>
+#include <mesos/containerizer/containerizer.hpp>
+
#include <process/future.hpp>
#include <process/owned.hpp>
#include <process/process.hpp>
@@ -50,26 +52,6 @@ struct SlaveState;
class Containerizer
{
public:
- // Information about a container termination.
- struct Termination
- {
- Termination(
- const Option<int>& _status,
- bool _killed,
- const std::string& _message)
- : status(_status),
- killed(_killed),
- message(_message) {}
-
- // Exit status of the executor.
- const Option<int> status;
-
- // A container may be killed if it exceeds its resources; this will be
- // indicated by killed=true and described by the message string.
- const bool killed;
- const std::string message;
- };
-
// Attempts to create a containerizer as specified by 'isolation' in flags.
static Try<Containerizer*> create(const Flags& flags, bool local);
@@ -111,7 +93,8 @@ public:
// containerizer should also destroy the containerized context. The future
// may be failed if an error occurs during termination of the executor or
// destruction of the container.
- virtual process::Future<Termination> wait(const ContainerID& containerId) = 0;
+ virtual process::Future<containerizer::Termination> wait(
+ const ContainerID& containerId) = 0;
// Destroy a running container, killing all processes and releasing all
// resources.
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/slave/containerizer/mesos_containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos_containerizer.cpp b/src/slave/containerizer/mesos_containerizer.cpp
index 1ce41d7..5afd26b 100644
--- a/src/slave/containerizer/mesos_containerizer.cpp
+++ b/src/slave/containerizer/mesos_containerizer.cpp
@@ -152,7 +152,7 @@ Future<ResourceStatistics> MesosContainerizer::usage(
}
-Future<Containerizer::Termination> MesosContainerizer::wait(
+Future<containerizer::Termination> MesosContainerizer::wait(
const ContainerID& containerId)
{
return dispatch(process, &MesosContainerizerProcess::wait, containerId);
@@ -244,8 +244,8 @@ Future<Nothing> MesosContainerizerProcess::_recover(
CHECK_SOME(run.id);
const ContainerID& containerId = run.id.get();
- Owned<Promise<Containerizer::Termination> > promise(
- new Promise<Containerizer::Termination>());
+ Owned<Promise<containerizer::Termination> > promise(
+ new Promise<containerizer::Termination>());
promises.put(containerId, promise);
CHECK_SOME(run.forkedPid);
@@ -375,8 +375,8 @@ Future<Nothing> MesosContainerizerProcess::launch(
return Failure("Container already started");
}
- Owned<Promise<Containerizer::Termination> > promise(
- new Promise<Containerizer::Termination>());
+ Owned<Promise<containerizer::Termination> > promise(
+ new Promise<containerizer::Termination>());
promises.put(containerId, promise);
// Store the resources for usage().
@@ -682,7 +682,7 @@ Future<Nothing> MesosContainerizerProcess::exec(
}
-Future<Containerizer::Termination> MesosContainerizerProcess::wait(
+Future<containerizer::Termination> MesosContainerizerProcess::wait(
const ContainerID& containerId)
{
if (!promises.contains(containerId)) {
@@ -855,10 +855,14 @@ void MesosContainerizerProcess::__destroy(
isolator->cleanup(containerId);
}
- promises[containerId]->set(Containerizer::Termination(
- status.isReady() ? status.get() : None(),
- killed,
- message));
+ containerizer::Termination termination;
+ termination.set_killed(killed);
+ termination.set_message(message);
+ if (status.isReady() && status.get().isSome()) {
+ termination.set_status(status.get().get());
+ }
+
+ promises[containerId]->set(termination);
promises.erase(containerId);
statuses.erase(containerId);
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/slave/containerizer/mesos_containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/slave/containerizer/mesos_containerizer.hpp b/src/slave/containerizer/mesos_containerizer.hpp
index ee1fd30..152a6b9 100644
--- a/src/slave/containerizer/mesos_containerizer.hpp
+++ b/src/slave/containerizer/mesos_containerizer.hpp
@@ -67,7 +67,7 @@ public:
virtual process::Future<ResourceStatistics> usage(
const ContainerID& containerId);
- virtual process::Future<Containerizer::Termination> wait(
+ virtual process::Future<containerizer::Termination> wait(
const ContainerID& containerId);
virtual void destroy(const ContainerID& containerId);
@@ -111,7 +111,7 @@ public:
process::Future<ResourceStatistics> usage(
const ContainerID& containerId);
- process::Future<Containerizer::Termination> wait(
+ process::Future<containerizer::Termination> wait(
const ContainerID& containerId);
void destroy(const ContainerID& containerId);
@@ -182,7 +182,7 @@ private:
// struct.
// Promises for futures returned from wait().
hashmap<ContainerID,
- process::Owned<process::Promise<Containerizer::Termination> > > promises;
+ process::Owned<process::Promise<containerizer::Termination> > > promises;
// We need to keep track of the future exit status for each executor because
// we'll only get a single notification when the executor exits.
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/slave/slave.cpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.cpp b/src/slave/slave.cpp
index d6ec87c..b3c4285 100644
--- a/src/slave/slave.cpp
+++ b/src/slave/slave.cpp
@@ -2149,7 +2149,7 @@ void _unmonitor(
void Slave::executorTerminated(
const FrameworkID& frameworkId,
const ExecutorID& executorId,
- const Future<Containerizer::Termination>& termination)
+ const Future<containerizer::Termination>& termination)
{
int status;
// A termination failure indicates the containerizer could not destroy a
@@ -2165,14 +2165,14 @@ void Slave::executorTerminated(
: "discarded");
// Set a special status for failure.
status = -1;
- } else if (termination.get().status.isNone()) {
+ } else if (!termination.get().has_status()) {
LOG(INFO) << "Executor '" << executorId
<< "' of framework " << frameworkId
<< " has terminated with unknown status";
// Set a special status for None.
status = -1;
} else {
- status = termination.get().status.get();
+ status = termination.get().status();
LOG(INFO) << "Executor '" << executorId
<< "' of framework " << frameworkId
<< (WIFEXITED(status)
@@ -2231,7 +2231,7 @@ void Slave::executorTerminated(
foreach (Task* task, executor->launchedTasks.values()) {
if (!protobuf::isTerminalState(task->state())) {
mesos::TaskState taskState;
- if ((termination.isReady() && termination.get().killed) ||
+ if ((termination.isReady() && termination.get().killed()) ||
executor->commandExecutor) {
taskState = TASK_FAILED;
} else {
@@ -2242,7 +2242,7 @@ void Slave::executorTerminated(
info.id(),
task->task_id(),
taskState,
- termination.isReady() ? termination.get().message :
+ termination.isReady() ? termination.get().message() :
"Abnormal executor termination",
executorId),
UPID());
@@ -2254,7 +2254,7 @@ void Slave::executorTerminated(
// supports it.
foreach (const TaskInfo& task, executor->queuedTasks.values()) {
mesos::TaskState taskState;
- if ((termination.isReady() && termination.get().killed) ||
+ if ((termination.isReady() && termination.get().killed()) ||
executor->commandExecutor) {
taskState = TASK_FAILED;
} else {
@@ -2265,7 +2265,7 @@ void Slave::executorTerminated(
info.id(),
task.task_id(),
taskState,
- termination.isReady() ? termination.get().message :
+ termination.isReady() ? termination.get().message() :
"Abnormal executor termination",
executorId),
UPID());
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/slave/slave.hpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp
index 1e98795..438e5b5 100644
--- a/src/slave/slave.hpp
+++ b/src/slave/slave.hpp
@@ -186,7 +186,7 @@ public:
void executorTerminated(
const FrameworkID& frameworkId,
const ExecutorID& executorId,
- const process::Future<Containerizer::Termination>& termination);
+ const process::Future<containerizer::Termination>& termination);
// NOTE: Pulled these to public to make it visible for testing.
// TODO(vinod): Make tests friends to this class instead.
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/tests/containerizer.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer.cpp b/src/tests/containerizer.cpp
index bfb9341..2599727 100644
--- a/src/tests/containerizer.cpp
+++ b/src/tests/containerizer.cpp
@@ -129,15 +129,15 @@ Future<Nothing> TestContainerizer::launch(
}
os::unsetenv("MESOS_LOCAL");
- Owned<Promise<slave::Containerizer::Termination> > promise(
- new Promise<slave::Containerizer::Termination>());
+ Owned<Promise<containerizer::Termination> > promise(
+ new Promise<containerizer::Termination>());
promises[containerId] = promise;
return Nothing();
}
-Future<slave::Containerizer::Termination> TestContainerizer::wait(
+Future<containerizer::Termination> TestContainerizer::wait(
const ContainerID& containerId)
{
CHECK(promises.contains(containerId))
@@ -172,8 +172,11 @@ void TestContainerizer::destroy(const ContainerID& containerId)
driver->join();
drivers.erase(containerId);
- promises[containerId]->set(
- slave::Containerizer::Termination(0, false, "Killed executor"));
+ containerizer::Termination termination;
+ termination.set_killed(false);
+ termination.set_message("Killed executor");
+ termination.set_status(0);
+ promises[containerId]->set(termination);
promises.erase(containerId);
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/0d5c8038/src/tests/containerizer.hpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer.hpp b/src/tests/containerizer.hpp
index a9f1531..562304c 100644
--- a/src/tests/containerizer.hpp
+++ b/src/tests/containerizer.hpp
@@ -73,7 +73,7 @@ public:
const process::PID<slave::Slave>& slavePid,
bool checkpoint);
- virtual process::Future<slave::Containerizer::Termination> wait(
+ virtual process::Future<containerizer::Termination> wait(
const ContainerID& containerId);
// Additional destroy method for testing because we won't know the
@@ -102,7 +102,7 @@ private:
hashmap<std::pair<FrameworkID, ExecutorID>, ContainerID> containers;
hashmap<ContainerID, process::Owned<MesosExecutorDriver> > drivers;
hashmap<ContainerID,
- process::Owned<process::Promise<slave::Containerizer::Termination> > > promises;
+ process::Owned<process::Promise<containerizer::Termination> > > promises;
};
} // namespace tests {