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 2011/06/05 11:22:13 UTC
svn commit: r1132302 - in /incubator/mesos/trunk: include/ src/
src/examples/ src/examples/java/ src/exec/ src/java/jni/
src/java/src/org/apache/mesos/ src/master/ src/messaging/ src/sched/
src/slave/ src/tests/
Author: benh
Date: Sun Jun 5 09:22:12 2011
New Revision: 1132302
URL: http://svn.apache.org/viewvc?rev=1132302&view=rev
Log:
Updated framework messages so that executors don't need to specify slave id and executor id. This breaks the Python port.
Modified:
incubator/mesos/trunk/include/mesos.proto
incubator/mesos/trunk/include/mesos_exec.hpp
incubator/mesos/trunk/include/mesos_sched.hpp
incubator/mesos/trunk/src/Makefile.in
incubator/mesos/trunk/src/examples/Makefile.in
incubator/mesos/trunk/src/examples/cpp_test_executor.cpp
incubator/mesos/trunk/src/examples/cpp_test_framework.cpp
incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java
incubator/mesos/trunk/src/examples/java/TestExecutor.java
incubator/mesos/trunk/src/examples/java/TestFramework.java
incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java
incubator/mesos/trunk/src/examples/memhog.cpp
incubator/mesos/trunk/src/examples/memhog_executor.cpp
incubator/mesos/trunk/src/examples/scheduled_memhog.cpp
incubator/mesos/trunk/src/exec/exec.cpp
incubator/mesos/trunk/src/java/jni/construct.cpp
incubator/mesos/trunk/src/java/jni/convert.cpp
incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp
incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java
incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java
incubator/mesos/trunk/src/master/master.cpp
incubator/mesos/trunk/src/master/master.hpp
incubator/mesos/trunk/src/messaging/messages.proto
incubator/mesos/trunk/src/sched/sched.cpp
incubator/mesos/trunk/src/slave/slave.cpp
incubator/mesos/trunk/src/slave/slave.hpp
incubator/mesos/trunk/src/tests/master_test.cpp
incubator/mesos/trunk/src/tests/offer_reply_errors_test.cpp
incubator/mesos/trunk/src/tests/utils.hpp
Modified: incubator/mesos/trunk/include/mesos.proto
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/mesos.proto?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/include/mesos.proto (original)
+++ incubator/mesos/trunk/include/mesos.proto Sun Jun 5 09:22:12 2011
@@ -84,7 +84,7 @@ message Resource {
message ExecutorArgs {
required FrameworkID framework_id = 1;
- required string name = 2;
+ required ExecutorID executor_id = 2;
required SlaveID slave_id = 3;
required string hostname = 4;
optional bytes data = 5;
@@ -150,13 +150,6 @@ message SlaveInfo {
}
-message FrameworkMessage {
- required SlaveID slave_id = 1;
- required ExecutorID executor_id = 2;
- optional bytes data = 3;
-}
-
-
message SlaveOffer {
required SlaveID slave_id = 1;
required string hostname = 2;
Modified: incubator/mesos/trunk/include/mesos_exec.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/mesos_exec.hpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/include/mesos_exec.hpp (original)
+++ incubator/mesos/trunk/include/mesos_exec.hpp Sun Jun 5 09:22:12 2011
@@ -29,7 +29,7 @@ public:
virtual void killTask(ExecutorDriver* driver, const TaskID& taskId) = 0;
virtual void frameworkMessage(ExecutorDriver* driver,
- const FrameworkMessage& message) = 0;
+ const std::string& data) = 0;
virtual void shutdown(ExecutorDriver* driver) = 0;
@@ -61,7 +61,7 @@ public:
// Communication methods from executor to Mesos.
virtual int sendStatusUpdate(const TaskStatus& status) = 0;
- virtual int sendFrameworkMessage(const FrameworkMessage& message) = 0;
+ virtual int sendFrameworkMessage(const std::string& data) = 0;
};
@@ -84,7 +84,7 @@ public:
virtual int run(); // Start and then join driver
virtual int sendStatusUpdate(const TaskStatus& status);
- virtual int sendFrameworkMessage(const FrameworkMessage& message);
+ virtual int sendFrameworkMessage(const std::string& data);
private:
friend class internal::ExecutorProcess;
Modified: incubator/mesos/trunk/include/mesos_sched.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/include/mesos_sched.hpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/include/mesos_sched.hpp (original)
+++ incubator/mesos/trunk/include/mesos_sched.hpp Sun Jun 5 09:22:12 2011
@@ -48,7 +48,9 @@ public:
const TaskStatus& status) = 0;
virtual void frameworkMessage(SchedulerDriver* driver,
- const FrameworkMessage& message) = 0;
+ const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const std::string& data) = 0;
virtual void slaveLost(SchedulerDriver* driver,
const SlaveID& slaveId) = 0;
@@ -80,7 +82,9 @@ public:
// Communication methods.
- virtual int sendFrameworkMessage(const FrameworkMessage& message) = 0;
+ virtual int sendFrameworkMessage(const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const std::string& data) = 0;
virtual int killTask(const TaskID& taskId) = 0;
@@ -165,7 +169,9 @@ public:
virtual int run(); // Start and then join driver.
// Communication methods.
- virtual int sendFrameworkMessage(const FrameworkMessage& message);
+ virtual int sendFrameworkMessage(const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const std::string& data);
virtual int killTask(const TaskID& taskId);
Modified: incubator/mesos/trunk/src/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/Makefile.in?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/Makefile.in (original)
+++ incubator/mesos/trunk/src/Makefile.in Sun Jun 5 09:22:12 2011
@@ -388,7 +388,8 @@ $(CONFDIR)/deploy-env.sh: | $(SRCDIR)/co
test: all
$(MAKE) -C tests test
-all: $(MESOS_LIBS) $(MESOS_EXES) java python $(WEBUI_FILES) $(CONF_FILES) $(DEPLOY_FILES)
+#all: $(MESOS_LIBS) $(MESOS_EXES) java python $(WEBUI_FILES) $(CONF_FILES) $(DEPLOY_FILES)
+all: $(MESOS_LIBS) $(MESOS_EXES) java $(WEBUI_FILES) $(CONF_FILES) $(DEPLOY_FILES)
$(MAKE) -C examples
$(MAKE) -C tests
Modified: incubator/mesos/trunk/src/examples/Makefile.in
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/Makefile.in?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/Makefile.in (original)
+++ incubator/mesos/trunk/src/examples/Makefile.in Sun Jun 5 09:22:12 2011
@@ -135,7 +135,8 @@ ifdef PYTHON_HEADERS
$(MAKE) -C python
endif
-all: $(EXAMPLES_EXES) java python
+#all: $(EXAMPLES_EXES) java python
+all: $(EXAMPLES_EXES) java
clean:
rm -f $(patsubst %, %.d, $(EXAMPLES_EXES))
Modified: incubator/mesos/trunk/src/examples/cpp_test_executor.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/cpp_test_executor.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/cpp_test_executor.cpp (original)
+++ incubator/mesos/trunk/src/examples/cpp_test_executor.cpp Sun Jun 5 09:22:12 2011
@@ -34,7 +34,7 @@ public:
virtual void killTask(ExecutorDriver* driver, const TaskID& taskId) {}
virtual void frameworkMessage(ExecutorDriver* driver,
- const FrameworkMessage& message) {}
+ const string& data) {}
virtual void shutdown(ExecutorDriver* driver) {}
Modified: incubator/mesos/trunk/src/examples/cpp_test_framework.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/cpp_test_framework.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/cpp_test_framework.cpp (original)
+++ incubator/mesos/trunk/src/examples/cpp_test_framework.cpp Sun Jun 5 09:22:12 2011
@@ -123,7 +123,9 @@ public:
}
virtual void frameworkMessage(SchedulerDriver* driver,
- const FrameworkMessage& message) {}
+ const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data) {}
virtual void slaveLost(SchedulerDriver* driver, const SlaveID& sid) {}
Modified: incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestExceptionFramework.java Sun Jun 5 09:22:12 2011
@@ -41,7 +41,7 @@ public class TestExceptionFramework {
public void statusUpdate(SchedulerDriver driver, TaskStatus status) {}
@Override
- public void frameworkMessage(SchedulerDriver driver, FrameworkMessage message) {}
+ public void frameworkMessage(SchedulerDriver driver, SlaveID slaveId, ExecutorID executorId, byte[] data) {}
@Override
public void slaveLost(SchedulerDriver driver, SlaveID slaveId) {}
Modified: incubator/mesos/trunk/src/examples/java/TestExecutor.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestExecutor.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestExecutor.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestExecutor.java Sun Jun 5 09:22:12 2011
@@ -36,7 +36,7 @@ public class TestExecutor implements Exe
public void killTask(ExecutorDriver driver, TaskID taskId) {}
@Override
- public void frameworkMessage(ExecutorDriver driver, FrameworkMessage message) {}
+ public void frameworkMessage(ExecutorDriver driver, byte[] data) {}
@Override
public void shutdown(ExecutorDriver driver) {}
Modified: incubator/mesos/trunk/src/examples/java/TestFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestFramework.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestFramework.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestFramework.java Sun Jun 5 09:22:12 2011
@@ -104,7 +104,7 @@ public class TestFramework {
}
@Override
- public void frameworkMessage(SchedulerDriver driver, FrameworkMessage message) {}
+ public void frameworkMessage(SchedulerDriver driver, SlaveID slaveId, ExecutorID executorId, byte[] data) {}
@Override
public void slaveLost(SchedulerDriver driver, SlaveID slaveId) {}
Modified: incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java (original)
+++ incubator/mesos/trunk/src/examples/java/TestMultipleExecutorsFramework.java Sun Jun 5 09:22:12 2011
@@ -159,7 +159,7 @@ public class TestMultipleExecutorsFramew
}
@Override
- public void frameworkMessage(SchedulerDriver driver, FrameworkMessage message) {}
+ public void frameworkMessage(SchedulerDriver driver, SlaveID slaveId, ExecutorID executorId, byte[] data) {}
@Override
public void slaveLost(SchedulerDriver driver, SlaveID slaveId) {}
Modified: incubator/mesos/trunk/src/examples/memhog.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/memhog.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/memhog.cpp (original)
+++ incubator/mesos/trunk/src/examples/memhog.cpp Sun Jun 5 09:22:12 2011
@@ -125,7 +125,9 @@ public:
}
virtual void frameworkMessage(SchedulerDriver* driver,
- const FrameworkMessage& message) {}
+ const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data) {}
virtual void slaveLost(SchedulerDriver* driver, const SlaveID& sid) {}
Modified: incubator/mesos/trunk/src/examples/memhog_executor.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/memhog_executor.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/memhog_executor.cpp (original)
+++ incubator/mesos/trunk/src/examples/memhog_executor.cpp Sun Jun 5 09:22:12 2011
@@ -61,7 +61,7 @@ public:
virtual void killTask(ExecutorDriver* driver, const TaskID& taskId) {}
virtual void frameworkMessage(ExecutorDriver* driver,
- const FrameworkMessage& message) {}
+ const string& data) {}
virtual void shutdown(ExecutorDriver* driver) {}
Modified: incubator/mesos/trunk/src/examples/scheduled_memhog.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/examples/scheduled_memhog.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/examples/scheduled_memhog.cpp (original)
+++ incubator/mesos/trunk/src/examples/scheduled_memhog.cpp Sun Jun 5 09:22:12 2011
@@ -185,7 +185,9 @@ public:
}
virtual void frameworkMessage(SchedulerDriver* driver,
- const FrameworkMessage& message) {}
+ const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data) {}
virtual void slaveLost(SchedulerDriver* driver, const SlaveID& sid) {}
Modified: incubator/mesos/trunk/src/exec/exec.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/exec/exec.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/exec/exec.cpp (original)
+++ incubator/mesos/trunk/src/exec/exec.cpp Sun Jun 5 09:22:12 2011
@@ -53,7 +53,10 @@ public:
&KillTaskMessage::task_id);
install(S2E_FRAMEWORK_MESSAGE, &ExecutorProcess::frameworkMessage,
- &FrameworkMessageMessage::message);
+ &FrameworkMessageMessage::slave_id,
+ &FrameworkMessageMessage::framework_id,
+ &FrameworkMessageMessage::executor_id,
+ &FrameworkMessageMessage::data);
install(S2E_KILL_EXECUTOR, &ExecutorProcess::killExecutor);
@@ -112,11 +115,14 @@ protected:
process::invoke(bind(&Executor::killTask, executor, driver, cref(taskId)));
}
- void frameworkMessage(const FrameworkMessage& message)
+ void frameworkMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const string& data)
{
- VLOG(1) << "Executor received message";
+ VLOG(1) << "Executor received framework message";
process::invoke(bind(&Executor::frameworkMessage, executor, driver,
- cref(message)));
+ cref(data)));
}
void killExecutor()
@@ -340,7 +346,7 @@ int MesosExecutorDriver::sendStatusUpdat
}
-int MesosExecutorDriver::sendFrameworkMessage(const FrameworkMessage& message)
+int MesosExecutorDriver::sendFrameworkMessage(const string& data)
{
Lock lock(&mutex);
@@ -351,19 +357,12 @@ int MesosExecutorDriver::sendFrameworkMe
CHECK(process != NULL);
- // Validate that they set the correct slave ID and executor ID.
- if (!(process->slaveId == message.slave_id())) {
- return -1;
- }
-
- if (!(process->executorId == message.executor_id())) {
- return -1;
- }
-
// TODO(benh): Do a dispatch to Executor first?
MSG<E2S_FRAMEWORK_MESSAGE> out;
+ out.mutable_slave_id()->MergeFrom(process->slaveId);
out.mutable_framework_id()->MergeFrom(process->frameworkId);
- out.mutable_message()->MergeFrom(message);
+ out.mutable_executor_id()->MergeFrom(process->executorId);
+ out.set_data(data);
process->send(process->slave, out);
return 0;
Modified: incubator/mesos/trunk/src/java/jni/construct.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/construct.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/construct.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/construct.cpp Sun Jun 5 09:22:12 2011
@@ -133,6 +133,27 @@ FrameworkID construct(JNIEnv* env, jobje
template <>
+ExecutorID construct(JNIEnv* env, jobject jobj)
+{
+ jclass clazz = env->GetObjectClass(jobj);
+
+ // byte[] data = obj.toByteArray();
+ jmethodID toByteArray = env->GetMethodID(clazz, "toByteArray", "()[B");
+
+ jbyteArray jdata = (jbyteArray) env->CallObjectMethod(jobj, toByteArray);
+
+ jbyte* data = env->GetByteArrayElements(jdata, NULL);
+ jsize length = env->GetArrayLength(jdata);
+
+ const ExecutorID& executorId = parse<ExecutorID>(data, length);
+
+ env->ReleaseByteArrayElements(jdata, data, 0);
+
+ return executorId;
+}
+
+
+template <>
TaskID construct(JNIEnv* env, jobject jobj)
{
jclass clazz = env->GetObjectClass(jobj);
@@ -252,27 +273,6 @@ TaskStatus construct(JNIEnv* env, jobjec
template <>
-FrameworkMessage construct(JNIEnv* env, jobject jobj)
-{
- jclass clazz = env->GetObjectClass(jobj);
-
- // byte[] data = obj.toByteArray();
- jmethodID toByteArray = env->GetMethodID(clazz, "toByteArray", "()[B");
-
- jbyteArray jdata = (jbyteArray) env->CallObjectMethod(jobj, toByteArray);
-
- jbyte* data = env->GetByteArrayElements(jdata, NULL);
- jsize length = env->GetArrayLength(jdata);
-
- const FrameworkMessage& message = parse<FrameworkMessage>(data, length);
-
- env->ReleaseByteArrayElements(jdata, data, 0);
-
- return message;
-}
-
-
-template <>
ExecutorInfo construct(JNIEnv* env, jobject jobj)
{
jclass clazz = env->GetObjectClass(jobj);
Modified: incubator/mesos/trunk/src/java/jni/convert.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/convert.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/convert.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/convert.cpp Sun Jun 5 09:22:12 2011
@@ -42,6 +42,29 @@ jobject convert(JNIEnv* env, const Frame
template <>
+jobject convert(JNIEnv* env, const ExecutorID& executorId)
+{
+ string data;
+ executorId.SerializeToString(&data);
+
+ // byte[] data = ..;
+ jbyteArray jdata = env->NewByteArray(data.size());
+ env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
+
+ // ExecutorID executorId = ExecutorID.parseFrom(data);
+ jclass clazz = env->FindClass("org/apache/mesos/Protos$ExecutorID");
+
+ jmethodID parseFrom =
+ env->GetStaticMethodID(clazz, "parseFrom",
+ "([B)Lorg/apache/mesos/Protos$ExecutorID;");
+
+ jobject jexecutorId = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
+
+ return jexecutorId;
+}
+
+
+template <>
jobject convert(JNIEnv* env, const TaskID& taskId)
{
string data;
@@ -198,29 +221,6 @@ jobject convert(JNIEnv* env, const Slave
template <>
-jobject convert(JNIEnv* env, const FrameworkMessage& message)
-{
- string data;
- message.SerializeToString(&data);
-
- // byte[] data = ..;
- jbyteArray jdata = env->NewByteArray(data.size());
- env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
-
- // FrameworkMessage message = FrameworkMessage.parseFrom(data);
- jclass clazz = env->FindClass("org/apache/mesos/Protos$FrameworkMessage");
-
- jmethodID parseFrom =
- env->GetStaticMethodID(clazz, "parseFrom",
- "([B)Lorg/apache/mesos/Protos$FrameworkMessage;");
-
- jobject jmessage = env->CallStaticObjectMethod(clazz, parseFrom, jdata);
-
- return jmessage;
-}
-
-
-template <>
jobject convert(JNIEnv* env, const ExecutorInfo& executor)
{
string data;
Modified: incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosExecutorDriver.cpp Sun Jun 5 09:22:12 2011
@@ -24,7 +24,7 @@ public:
virtual void init(ExecutorDriver* driver, const ExecutorArgs& args);
virtual void launchTask(ExecutorDriver* driver, const TaskDescription& task);
virtual void killTask(ExecutorDriver* driver, const TaskID& taskId);
- virtual void frameworkMessage(ExecutorDriver* driver, const FrameworkMessage& message);
+ virtual void frameworkMessage(ExecutorDriver* driver, const string& data);
virtual void shutdown(ExecutorDriver* driver);
virtual void error(ExecutorDriver* driver, int code, const string& message);
@@ -47,7 +47,9 @@ void JNIExecutor::init(ExecutorDriver* d
// exec.init(driver);
jmethodID init =
- env->GetMethodID(clazz, "init", "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$ExecutorArgs;)V");
+ env->GetMethodID(clazz, "init",
+ "(Lorg/apache/mesos/ExecutorDriver;"
+ "Lorg/apache/mesos/Protos$ExecutorArgs;)V");
jobject jargs = convert<ExecutorArgs>(env, args);
@@ -79,8 +81,10 @@ void JNIExecutor::launchTask(ExecutorDri
clazz = env->GetObjectClass(jexec);
// exec.launchTask(driver, desc);
- jmethodID launchTask = env->GetMethodID(clazz, "launchTask",
- "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$TaskDescription;)V");
+ jmethodID launchTask =
+ env->GetMethodID(clazz, "launchTask",
+ "(Lorg/apache/mesos/ExecutorDriver;"
+ "Lorg/apache/mesos/Protos$TaskDescription;)V");
jobject jdesc = convert<TaskDescription>(env, desc);
@@ -112,8 +116,10 @@ void JNIExecutor::killTask(ExecutorDrive
clazz = env->GetObjectClass(jexec);
// exec.killTask(driver, taskId);
- jmethodID killTask = env->GetMethodID(clazz, "killTask",
- "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$TaskID;)V");
+ jmethodID killTask =
+ env->GetMethodID(clazz, "killTask",
+ "(Lorg/apache/mesos/ExecutorDriver;"
+ "Lorg/apache/mesos/Protos$TaskID;)V");
jobject jtaskId = convert<TaskID>(env, taskId);
@@ -133,7 +139,7 @@ void JNIExecutor::killTask(ExecutorDrive
}
-void JNIExecutor::frameworkMessage(ExecutorDriver* driver, const FrameworkMessage& message)
+void JNIExecutor::frameworkMessage(ExecutorDriver* driver, const string& data)
{
jvm->AttachCurrentThread((void**) &env, NULL);
@@ -144,15 +150,19 @@ void JNIExecutor::frameworkMessage(Execu
clazz = env->GetObjectClass(jexec);
- // exec.frameworkMessage(driver, message);
- jmethodID frameworkMessage = env->GetMethodID(clazz, "frameworkMessage",
- "(Lorg/apache/mesos/ExecutorDriver;Lorg/apache/mesos/Protos$FrameworkMessage;)V");
-
- jobject jmessage = convert<FrameworkMessage>(env, message);
+ // exec.frameworkMessage(driver, data);
+ jmethodID frameworkMessage =
+ env->GetMethodID(clazz, "frameworkMessage",
+ "(Lorg/apache/mesos/ExecutorDriver;"
+ "[B)V");
+
+ // byte[] data = ..;
+ jbyteArray jdata = env->NewByteArray(data.size());
+ env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
env->ExceptionClear();
- env->CallVoidMethod(jexec, frameworkMessage, jdriver, jmessage);
+ env->CallVoidMethod(jexec, frameworkMessage, jdriver, jdata);
if (!env->ExceptionOccurred()) {
jvm->DetachCurrentThread();
@@ -179,7 +189,8 @@ void JNIExecutor::shutdown(ExecutorDrive
// exec.shutdown(driver);
jmethodID shutdown =
- env->GetMethodID(clazz, "shutdown", "(Lorg/apache/mesos/ExecutorDriver;)V");
+ env->GetMethodID(clazz, "shutdown",
+ "(Lorg/apache/mesos/ExecutorDriver;)V");
env->ExceptionClear();
@@ -209,8 +220,11 @@ void JNIExecutor::error(ExecutorDriver*
clazz = env->GetObjectClass(jexec);
// exec.error(driver, code, message);
- jmethodID error = env->GetMethodID(clazz, "error",
- "(Lorg/apache/mesos/ExecutorDriver;ILjava/lang/String;)V");
+ jmethodID error =
+ env->GetMethodID(clazz, "error",
+ "(Lorg/apache/mesos/ExecutorDriver;"
+ "I"
+ "Ljava/lang/String;)V");
jint jcode = code;
jobject jmessage = convert<string>(env, message);
@@ -371,13 +385,14 @@ JNIEXPORT jint JNICALL Java_org_apache_m
/*
* Class: org_apache_mesos_MesosExecutorDriver
* Method: sendFrameworkMessage
- * Signature: (Lorg/apache/mesos/Protos$FrameworkMessage;)I
+ * Signature: ([B)I
*/
JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosExecutorDriver_sendFrameworkMessage
- (JNIEnv* env, jobject thiz, jobject jmessage)
+ (JNIEnv* env, jobject thiz, jbyteArray jdata)
{
- // Construct a C++ FrameworkMessage from the Java FrameworkMessage.
- const FrameworkMessage& message = construct<FrameworkMessage>(env, jmessage);
+ // Construct a C++ string from the Java byte array.
+ string data((char*) env->GetByteArrayElements(jdata, NULL),
+ (size_t) env->GetArrayLength(jdata));
// Now invoke the underlying driver.
jclass clazz = env->GetObjectClass(thiz);
@@ -386,7 +401,7 @@ JNIEXPORT jint JNICALL Java_org_apache_m
MesosExecutorDriver* driver = (MesosExecutorDriver*)
env->GetLongField(thiz, __driver);
- return driver->sendFrameworkMessage(message);
+ return driver->sendFrameworkMessage(data);
}
Modified: incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp (original)
+++ incubator/mesos/trunk/src/java/jni/org_apache_mesos_MesosSchedulerDriver.cpp Sun Jun 5 09:22:12 2011
@@ -36,7 +36,9 @@ public:
virtual void offerRescinded(SchedulerDriver* driver, const OfferID& offerId);
virtual void statusUpdate(SchedulerDriver* driver, const TaskStatus& status);
virtual void frameworkMessage(SchedulerDriver* driver,
- const FrameworkMessage& message);
+ const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data);
virtual void slaveLost(SchedulerDriver* driver, const SlaveID& slaveId);
virtual void error(SchedulerDriver* driver, int code, const string& message);
@@ -60,8 +62,10 @@ string JNIScheduler::getFrameworkName(Sc
clazz = env->GetObjectClass(jsched);
// String name = sched.getFrameworkName(driver);
- jmethodID getFrameworkName = env->GetMethodID(clazz, "getFrameworkName",
- "(Lorg/apache/mesos/SchedulerDriver;)Ljava/lang/String;");
+ jmethodID getFrameworkName =
+ env->GetMethodID(clazz, "getFrameworkName",
+ "(Lorg/apache/mesos/SchedulerDriver;)"
+ "Ljava/lang/String;");
env->ExceptionClear();
@@ -96,8 +100,10 @@ ExecutorInfo JNIScheduler::getExecutorIn
clazz = env->GetObjectClass(jsched);
// ExecutorInfo executor = sched.getExecutorInfo(driver);
- jmethodID getExecutorInfo = env->GetMethodID(clazz, "getExecutorInfo",
- "(Lorg/apache/mesos/SchedulerDriver;)Lorg/apache/mesos/Protos$ExecutorInfo;");
+ jmethodID getExecutorInfo =
+ env->GetMethodID(clazz, "getExecutorInfo",
+ "(Lorg/apache/mesos/SchedulerDriver;)"
+ "Lorg/apache/mesos/Protos$ExecutorInfo;");
env->ExceptionClear();
@@ -131,8 +137,10 @@ void JNIScheduler::registered(SchedulerD
clazz = env->GetObjectClass(jsched);
// sched.registered(driver, frameworkId);
- jmethodID registered = env->GetMethodID(clazz, "registered",
- "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$FrameworkID;)V");
+ jmethodID registered =
+ env->GetMethodID(clazz, "registered",
+ "(Lorg/apache/mesos/SchedulerDriver;"
+ "Lorg/apache/mesos/Protos$FrameworkID;)V");
jobject jframeworkId = convert<FrameworkID>(env, frameworkId);
@@ -166,8 +174,11 @@ void JNIScheduler::resourceOffer(Schedul
clazz = env->GetObjectClass(jsched);
// sched.resourceOffer(driver, offerId, offers);
- jmethodID resourceOffer = env->GetMethodID(clazz, "resourceOffer",
- "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$OfferID;Ljava/util/List;)V");
+ jmethodID resourceOffer =
+ env->GetMethodID(clazz, "resourceOffer",
+ "(Lorg/apache/mesos/SchedulerDriver;"
+ "Lorg/apache/mesos/Protos$OfferID;"
+ "Ljava/util/List;)V");
jobject jofferId = convert<OfferID>(env, offerId);
@@ -214,8 +225,10 @@ void JNIScheduler::offerRescinded(Schedu
clazz = env->GetObjectClass(jsched);
// sched.offerRescinded(driver, offerId);
- jmethodID offerRescinded = env->GetMethodID(clazz, "offerRescinded",
- "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$OfferID;)V");
+ jmethodID offerRescinded =
+ env->GetMethodID(clazz, "offerRescinded",
+ "(Lorg/apache/mesos/SchedulerDriver;"
+ "Lorg/apache/mesos/Protos$OfferID;)V");
jobject jofferId = convert<OfferID>(env, offerId);
@@ -248,8 +261,10 @@ void JNIScheduler::statusUpdate(Schedule
clazz = env->GetObjectClass(jsched);
// sched.statusUpdate(driver, status);
- jmethodID statusUpdate = env->GetMethodID(clazz, "statusUpdate",
- "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$TaskStatus;)V");
+ jmethodID statusUpdate =
+ env->GetMethodID(clazz, "statusUpdate",
+ "(Lorg/apache/mesos/SchedulerDriver;"
+ "Lorg/apache/mesos/Protos$TaskStatus;)V");
jobject jstatus = convert<TaskStatus>(env, status);
@@ -270,7 +285,9 @@ void JNIScheduler::statusUpdate(Schedule
void JNIScheduler::frameworkMessage(SchedulerDriver* driver,
- const FrameworkMessage& message)
+ const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data)
{
jvm->AttachCurrentThread((void**) &env, NULL);
@@ -281,15 +298,24 @@ void JNIScheduler::frameworkMessage(Sche
clazz = env->GetObjectClass(jsched);
- // sched.frameworkMessage(driver, message);
- jmethodID frameworkMessage = env->GetMethodID(clazz, "frameworkMessage",
- "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$FrameworkMessage;)V");
+ // sched.frameworkMessage(driver, slaveId, executorId, data);
+ jmethodID frameworkMessage =
+ env->GetMethodID(clazz, "frameworkMessage",
+ "(Lorg/apache/mesos/SchedulerDriver;"
+ "Lorg/apache/mesos/Protos$SlaveID;"
+ "Lorg/apache/mesos/Protos$ExecutorID;[B)V");
+
+ // byte[] data = ..;
+ jbyteArray jdata = env->NewByteArray(data.size());
+ env->SetByteArrayRegion(jdata, 0, data.size(), (jbyte*) data.data());
- jobject jmessage = convert<FrameworkMessage>(env, message);
+ jobject jslaveId = convert<SlaveID>(env, slaveId);
+ jobject jexecutorId = convert<ExecutorID>(env, executorId);
env->ExceptionClear();
- env->CallVoidMethod(jsched, frameworkMessage, jdriver, jmessage);
+ env->CallVoidMethod(jsched, frameworkMessage,
+ jdriver, jslaveId, jexecutorId, jdata);
if (!env->ExceptionOccurred()) {
jvm->DetachCurrentThread();
@@ -315,8 +341,10 @@ void JNIScheduler::slaveLost(SchedulerDr
clazz = env->GetObjectClass(jsched);
// sched.slaveLost(driver, slaveId);
- jmethodID slaveLost = env->GetMethodID(clazz, "slaveLost",
- "(Lorg/apache/mesos/SchedulerDriver;Lorg/apache/mesos/Protos$SlaveID;)V");
+ jmethodID slaveLost =
+ env->GetMethodID(clazz, "slaveLost",
+ "(Lorg/apache/mesos/SchedulerDriver;"
+ "Lorg/apache/mesos/Protos$SlaveID;)V");
jobject jslaveId = convert<SlaveID>(env, slaveId);
@@ -349,8 +377,11 @@ void JNIScheduler::error(SchedulerDriver
clazz = env->GetObjectClass(jsched);
// sched.error(driver, code, message);
- jmethodID error = env->GetMethodID(clazz, "error",
- "(Lorg/apache/mesos/SchedulerDriver;ILjava/lang/String;)V");
+ jmethodID error =
+ env->GetMethodID(clazz, "error",
+ "(Lorg/apache/mesos/SchedulerDriver;"
+ "I"
+ "Ljava/lang/String;)V");
jint jcode = code;
jobject jmessage = convert<string>(env, message);
@@ -500,13 +531,20 @@ JNIEXPORT jint JNICALL Java_org_apache_m
/*
* Class: org_apache_mesos_MesosSchedulerDriver
* Method: sendFrameworkMessage
- * Signature: (Lorg/apache/mesos/Protos$FrameworkMessage;)I
+ * Signature: (Lorg/apache/mesos/Protos/SlaveID;Lorg/apache/mesos/Protos/ExecutorID;[B)I
*/
JNIEXPORT jint JNICALL Java_org_apache_mesos_MesosSchedulerDriver_sendFrameworkMessage
- (JNIEnv* env, jobject thiz, jobject jmessage)
+ (JNIEnv* env, jobject thiz, jobject jslaveId, jobject jexecutorId, jbyteArray jdata)
{
- // Construct a C++ FrameworkMessage from the Java FrameworkMessage.
- const FrameworkMessage& message = construct<FrameworkMessage>(env, jmessage);
+ // Construct a C++ SlaveID from the Java SlaveID.
+ const SlaveID& slaveId = construct<SlaveID>(env, jslaveId);
+
+ // Construct a C++ ExecutorID from the Java ExecutorID.
+ const ExecutorID& executorId = construct<ExecutorID>(env, jexecutorId);
+
+ // Construct a C++ string from the Java byte array.
+ string data((char*) env->GetByteArrayElements(jdata, NULL),
+ (size_t) env->GetArrayLength(jdata));
// Now invoke the underlying driver.
jclass clazz = env->GetObjectClass(thiz);
@@ -515,7 +553,7 @@ JNIEXPORT jint JNICALL Java_org_apache_m
MesosSchedulerDriver* driver = (MesosSchedulerDriver*)
env->GetLongField(thiz, __driver);
- return driver->sendFrameworkMessage(message);
+ return driver->sendFrameworkMessage(slaveId, executorId, data);
}
Modified: incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/Executor.java Sun Jun 5 09:22:12 2011
@@ -10,7 +10,7 @@ public interface Executor {
public void init(ExecutorDriver driver, ExecutorArgs args);
public void launchTask(ExecutorDriver driver, TaskDescription task);
public void killTask(ExecutorDriver driver, TaskID taskId);
- public void frameworkMessage(ExecutorDriver driver, FrameworkMessage message);
+ public void frameworkMessage(ExecutorDriver driver, byte[] data);
public void shutdown(ExecutorDriver driver);
public void error(ExecutorDriver driver, int code, String message);
}
Modified: incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/ExecutorDriver.java Sun Jun 5 09:22:12 2011
@@ -20,5 +20,5 @@ public interface ExecutorDriver {
// Communication methods.
public int sendStatusUpdate(TaskStatus status);
- public int sendFrameworkMessage(FrameworkMessage message);
+ public int sendFrameworkMessage(byte[] data);
}
Modified: incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosExecutorDriver.java Sun Jun 5 09:22:12 2011
@@ -31,7 +31,7 @@ public class MesosExecutorDriver impleme
}
public native int sendStatusUpdate(TaskStatus status);
- public native int sendFrameworkMessage(FrameworkMessage message);
+ public native int sendFrameworkMessage(byte[] data);
protected native void initialize();
protected native void finalize();
Modified: incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/MesosSchedulerDriver.java Sun Jun 5 09:22:12 2011
@@ -37,7 +37,7 @@ public class MesosSchedulerDriver implem
return ret != 0 ? ret : join();
}
- public native int sendFrameworkMessage(FrameworkMessage message);
+ public native int sendFrameworkMessage(SlaveID slaveId, ExecutorID executorId, byte[] data);
public native int killTask(TaskID taskId);
public native int replyToOffer(OfferID offerId, Collection<TaskDescription> tasks, Map<String, String> params);
Modified: incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/Scheduler.java Sun Jun 5 09:22:12 2011
@@ -15,7 +15,7 @@ public interface Scheduler {
public void resourceOffer(SchedulerDriver driver, OfferID offerId, List<SlaveOffer> offers);
public void offerRescinded(SchedulerDriver driver, OfferID offerId);
public void statusUpdate(SchedulerDriver driver, TaskStatus status);
- public void frameworkMessage(SchedulerDriver driver, FrameworkMessage message);
+ public void frameworkMessage(SchedulerDriver driver, SlaveID slaveId, ExecutorID executorId, byte[] data);
public void slaveLost(SchedulerDriver driver, SlaveID slaveId);
public void error(SchedulerDriver driver, int code, String message);
}
Modified: incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java (original)
+++ incubator/mesos/trunk/src/java/src/org/apache/mesos/SchedulerDriver.java Sun Jun 5 09:22:12 2011
@@ -14,7 +14,7 @@ public interface SchedulerDriver {
public int run();
// Communication methods.
- public int sendFrameworkMessage(FrameworkMessage message);
+ public int sendFrameworkMessage(SlaveID slaveId, ExecutorID executorId, byte[] data);
public int killTask(TaskID taskId);
public int replyToOffer(OfferID offerId, Collection<TaskDescription> tasks, Map<String, String> params);
public int replyToOffer(OfferID offerId, Collection<TaskDescription> tasks);
Modified: incubator/mesos/trunk/src/master/master.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/master.cpp (original)
+++ incubator/mesos/trunk/src/master/master.cpp Sun Jun 5 09:22:12 2011
@@ -470,8 +470,10 @@ void Master::initialize()
&KillTaskMessage::task_id);
install(F2M_FRAMEWORK_MESSAGE, &Master::schedulerMessage,
+ &FrameworkMessageMessage::slave_id,
&FrameworkMessageMessage::framework_id,
- &FrameworkMessageMessage::message);
+ &FrameworkMessageMessage::executor_id,
+ &FrameworkMessageMessage::data);
install(F2M_STATUS_UPDATE_ACK, &Master::statusUpdateAck,
&StatusUpdateAckMessage::framework_id,
@@ -494,8 +496,10 @@ void Master::initialize()
&StatusUpdateMessage::status);
install(S2M_FRAMEWORK_MESSAGE, &Master::executorMessage,
+ &FrameworkMessageMessage::slave_id,
&FrameworkMessageMessage::framework_id,
- &FrameworkMessageMessage::message);
+ &FrameworkMessageMessage::executor_id,
+ &FrameworkMessageMessage::data);
install(S2M_EXITED_EXECUTOR, &Master::exitedExecutor,
&ExitedExecutorMessage::slave_id,
@@ -748,27 +752,31 @@ void Master::killTask(const FrameworkID&
}
-void Master::schedulerMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message)
+void Master::schedulerMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const string& data)
{
Framework* framework = lookupFramework(frameworkId);
if (framework != NULL) {
- Slave* slave = lookupSlave(message.slave_id());
+ Slave* slave = lookupSlave(slaveId);
if (slave != NULL) {
LOG(INFO) << "Sending framework message for framework "
- << frameworkId << " to slave " << slave->slaveId;
+ << frameworkId << " to slave " << slaveId;
MSG<M2S_FRAMEWORK_MESSAGE> out;
+ out.mutable_slave_id()->MergeFrom(slaveId);
out.mutable_framework_id()->MergeFrom(frameworkId);
- out.mutable_message()->MergeFrom(message);
+ out.mutable_executor_id()->MergeFrom(executorId);
+ out.set_data(data);
send(slave->pid, out);
} else {
LOG(WARNING) << "Cannot send framework message for framework "
- << frameworkId << " to slave " << message.slave_id()
+ << frameworkId << " to slave " << slaveId
<< " because slave does not exist";
}
} else {
LOG(WARNING) << "Cannot send framework message for framework "
- << frameworkId << " to slave " << message.slave_id()
+ << frameworkId << " to slave " << slaveId
<< " because framework does not exist";
}
}
@@ -964,7 +972,7 @@ void Master::statusUpdate(const Framewor
}
} else {
LOG(WARNING) << "Status update error: couldn't lookup "
- << "framework " <<frameworkId;
+ << "framework " << frameworkId;
}
} else {
LOG(WARNING) << "Status update error: couldn't lookup slave "
@@ -973,27 +981,31 @@ void Master::statusUpdate(const Framewor
}
-void Master::executorMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message)
+void Master::executorMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const string& data)
{
- Slave* slave = lookupSlave(message.slave_id());
+ Slave* slave = lookupSlave(slaveId);
if (slave != NULL) {
Framework* framework = lookupFramework(frameworkId);
if (framework != NULL) {
- LOG(INFO) << "Sending framework message from slave " << slave->slaveId
+ LOG(INFO) << "Sending framework message from slave " << slaveId
<< " to framework " << frameworkId;
MSG<M2S_FRAMEWORK_MESSAGE> out;
+ out.mutable_slave_id()->MergeFrom(slaveId);
out.mutable_framework_id()->MergeFrom(frameworkId);
- out.mutable_message()->MergeFrom(message);
+ out.mutable_executor_id()->MergeFrom(executorId);
+ out.set_data(data);
send(framework->pid, out);
} else {
LOG(WARNING) << "Cannot send framework message from slave "
- << slave->slaveId << " to framework " << frameworkId
+ << slaveId << " to framework " << frameworkId
<< " because framework does not exist";
}
} else {
LOG(WARNING) << "Cannot send framework message from slave "
- << message.slave_id() << " to framework " << frameworkId
+ << slaveId << " to framework " << frameworkId
<< " because slave does not exist";
}
}
Modified: incubator/mesos/trunk/src/master/master.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/master/master.hpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/master/master.hpp (original)
+++ incubator/mesos/trunk/src/master/master.hpp Sun Jun 5 09:22:12 2011
@@ -123,8 +123,10 @@ public:
void reviveOffers(const FrameworkID& frameworkId);
void killTask(const FrameworkID& frameworkId,
const TaskID& taskId);
- void schedulerMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message);
+ void schedulerMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const std::string& data);
void statusUpdateAck(const FrameworkID& frameworkId,
const TaskID& taskId,
const SlaveID& slaveId);
@@ -135,8 +137,10 @@ public:
void unregisterSlave(const SlaveID& slaveId);
void statusUpdate(const FrameworkID& frameworkId,
const TaskStatus& status);
- void executorMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message);
+ void executorMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const std::string& data);
void exitedExecutor(const SlaveID& slaveId,
const FrameworkID& frameworkId,
const ExecutorID& executorId,
Modified: incubator/mesos/trunk/src/messaging/messages.proto
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/messaging/messages.proto?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/messaging/messages.proto (original)
+++ incubator/mesos/trunk/src/messaging/messages.proto Sun Jun 5 09:22:12 2011
@@ -27,8 +27,10 @@ message ResourceOffer {
message FrameworkMessageMessage { // :(
- required FrameworkID framework_id = 1;
- required FrameworkMessage message = 2;
+ required SlaveID slave_id = 1;
+ required FrameworkID framework_id = 2;
+ required ExecutorID executor_id = 3;
+ required bytes data = 4;
}
Modified: incubator/mesos/trunk/src/sched/sched.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/sched/sched.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/sched/sched.cpp (original)
+++ incubator/mesos/trunk/src/sched/sched.cpp Sun Jun 5 09:22:12 2011
@@ -97,7 +97,10 @@ public:
&LostSlaveMessage::slave_id);
install(M2F_FRAMEWORK_MESSAGE, &SchedulerProcess::frameworkMessage,
- &FrameworkMessageMessage::message);
+ &FrameworkMessageMessage::slave_id,
+ &FrameworkMessageMessage::framework_id,
+ &FrameworkMessageMessage::executor_id,
+ &FrameworkMessageMessage::data);
install(M2F_ERROR, &SchedulerProcess::error,
&FrameworkErrorMessage::code,
@@ -242,11 +245,14 @@ protected:
process::invoke(bind(&Scheduler::slaveLost, sched, driver, cref(slaveId)));
}
- void frameworkMessage(const FrameworkMessage& message)
+ void frameworkMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const string& data)
{
- VLOG(1) << "Received message";
+ VLOG(1) << "Received framework message";
process::invoke(bind(&Scheduler::frameworkMessage, sched, driver,
- cref(message)));
+ cref(slaveId), cref(executorId), cref(data)));
}
void error(int32_t code, const string& message)
@@ -326,13 +332,15 @@ protected:
send(master, out);
}
- void sendFrameworkMessage(const FrameworkMessage& message)
+ void sendFrameworkMessage(const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data)
{
if (!active)
return;
VLOG(1) << "Asked to send framework message to slave "
- << message.slave_id();
+ << slaveId;
// TODO(benh): After a scheduler has re-registered it won't have
// any saved slave PIDs, maybe it makes sense to try and save each
@@ -340,22 +348,26 @@ protected:
// just wait for them to recollect as new offers come in and get
// accepted.
- if (savedSlavePids.count(message.slave_id()) > 0) {
- UPID slave = savedSlavePids[message.slave_id()];
+ if (savedSlavePids.count(slaveId) > 0) {
+ UPID slave = savedSlavePids[slaveId];
CHECK(slave != UPID());
// TODO(benh): This is kind of wierd, M2S?
MSG<M2S_FRAMEWORK_MESSAGE> out;
+ out.mutable_slave_id()->MergeFrom(slaveId);
out.mutable_framework_id()->MergeFrom(frameworkId);
- out.mutable_message()->MergeFrom(message);
+ out.mutable_executor_id()->MergeFrom(executorId);
+ out.set_data(data);
send(slave, out);
} else {
- VLOG(1) << "Cannot send directly to slave " << message.slave_id()
+ VLOG(1) << "Cannot send directly to slave " << slaveId
<< "; sending through master";
MSG<F2M_FRAMEWORK_MESSAGE> out;
+ out.mutable_slave_id()->MergeFrom(slaveId);
out.mutable_framework_id()->MergeFrom(frameworkId);
- out.mutable_message()->MergeFrom(message);
+ out.mutable_executor_id()->MergeFrom(executorId);
+ out.set_data(data);
send(master, out);
}
}
@@ -682,7 +694,9 @@ int MesosSchedulerDriver::reviveOffers()
}
-int MesosSchedulerDriver::sendFrameworkMessage(const FrameworkMessage& message)
+int MesosSchedulerDriver::sendFrameworkMessage(const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data)
{
Lock lock(&mutex);
@@ -690,19 +704,8 @@ int MesosSchedulerDriver::sendFrameworkM
return -1;
}
- // Make sure necessary fields have been completed.
- if (!message.has_slave_id()) {
- VLOG(1) << "Missing SlaveID (slave_id), cannot send message";
- return -1;
- }
-
- if (!message.has_executor_id()) {
- VLOG(1) << "Missing ExecutorID (executor_id), cannot send message";
- return -1;
- }
-
process::dispatch(process->self(), &SchedulerProcess::sendFrameworkMessage,
- message);
+ slaveId, executorId, data);
return 0;
}
Modified: incubator/mesos/trunk/src/slave/slave.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/slave.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave/slave.cpp (original)
+++ incubator/mesos/trunk/src/slave/slave.cpp Sun Jun 5 09:22:12 2011
@@ -220,8 +220,10 @@ void Slave::initialize()
&KillFrameworkMessage::framework_id);
install(M2S_FRAMEWORK_MESSAGE, &Slave::schedulerMessage,
+ &FrameworkMessageMessage::slave_id,
&FrameworkMessageMessage::framework_id,
- &FrameworkMessageMessage::message);
+ &FrameworkMessageMessage::executor_id,
+ &FrameworkMessageMessage::data);
install(M2S_UPDATE_FRAMEWORK, &Slave::updateFramework,
&UpdateFrameworkMessage::framework_id,
@@ -241,8 +243,10 @@ void Slave::initialize()
&StatusUpdateMessage::status);
install(E2S_FRAMEWORK_MESSAGE, &Slave::executorMessage,
+ &FrameworkMessageMessage::slave_id,
&FrameworkMessageMessage::framework_id,
- &FrameworkMessageMessage::message);
+ &FrameworkMessageMessage::executor_id,
+ &FrameworkMessageMessage::data);
install(PING, &Slave::ping);
@@ -424,27 +428,31 @@ void Slave::killFramework(const Framewor
}
-void Slave::schedulerMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message)
+void Slave::schedulerMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const string& data)
{
Framework* framework = getFramework(frameworkId);
if (framework != NULL) {
- Executor* executor = framework->getExecutor(message.executor_id());
+ Executor* executor = framework->getExecutor(executorId);
if (executor == NULL) {
LOG(WARNING) << "Dropping message for executor '"
- << message.executor_id() << "' of framework " << frameworkId
+ << executorId << "' of framework " << frameworkId
<< " because executor does not exist";
} else if (!executor->pid) {
// TODO(*): If executor is not started, queue framework message?
// (It's probably okay to just drop it since frameworks can have
// the executor send a message to the master to say when it's ready.)
LOG(WARNING) << "Dropping message for executor '"
- << message.executor_id() << "' of framework " << frameworkId
+ << executorId << "' of framework " << frameworkId
<< " because executor is not running";
} else {
MSG<S2E_FRAMEWORK_MESSAGE> out;
+ out.mutable_slave_id()->MergeFrom(slaveId);
out.mutable_framework_id()->MergeFrom(frameworkId);
- out.mutable_message()->MergeFrom(message);
+ out.mutable_executor_id()->MergeFrom(executorId);
+ out.set_data(data);
send(executor->pid, out);
}
} else {
@@ -516,7 +524,7 @@ void Slave::registerExecutor(const Frame
MSG<S2E_REGISTER_REPLY> out;
ExecutorArgs* args = out.mutable_args();
args->mutable_framework_id()->MergeFrom(framework->frameworkId);
- args->set_name(framework->info.name());
+ args->mutable_executor_id()->MergeFrom(executor->info.executor_id());
args->mutable_slave_id()->MergeFrom(slaveId);
args->set_hostname(slave.hostname());
args->set_data(framework->info.executor().data());
@@ -575,20 +583,22 @@ void Slave::statusUpdate(const Framework
}
-void Slave::executorMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message)
+void Slave::executorMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const string& data)
{
Framework* framework = getFramework(frameworkId);
if (framework != NULL) {
- LOG(INFO) << "Sending message for framework "
- << framework->frameworkId
+ LOG(INFO) << "Sending message for framework " << frameworkId
<< " to " << framework->pid;
// TODO(benh): This is weird, sending an M2F message.
MSG<M2F_FRAMEWORK_MESSAGE> out;
+ out.mutable_slave_id()->MergeFrom(slaveId);
out.mutable_framework_id()->MergeFrom(frameworkId);
- out.mutable_message()->MergeFrom(message);
- out.mutable_message()->mutable_slave_id()->MergeFrom(slaveId);
+ out.mutable_executor_id()->MergeFrom(executorId);
+ out.set_data(data);
send(framework->pid, out);
}
}
Modified: incubator/mesos/trunk/src/slave/slave.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/slave/slave.hpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/slave/slave.hpp (original)
+++ incubator/mesos/trunk/src/slave/slave.hpp Sun Jun 5 09:22:12 2011
@@ -215,8 +215,10 @@ public:
void killTask(const FrameworkID& frameworkId,
const TaskID& taskId);
void killFramework(const FrameworkID& frameworkId);
- void schedulerMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message);
+ void schedulerMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const std::string& data);
void updateFramework(const FrameworkID& frameworkId,
const std::string& pid);
void statusUpdateAck(const FrameworkID& frameworkId,
@@ -226,8 +228,10 @@ public:
const ExecutorID& executorId);
void statusUpdate(const FrameworkID& frameworkId,
const TaskStatus& status);
- void executorMessage(const FrameworkID& frameworkId,
- const FrameworkMessage& message);
+ void executorMessage(const SlaveID& slaveId,
+ const FrameworkID& frameworkId,
+ const ExecutorID& executorId,
+ const std::string& data);
void ping();
void timeout();
void exited();
Modified: incubator/mesos/trunk/src/tests/master_test.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/master_test.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/master_test.cpp (original)
+++ incubator/mesos/trunk/src/tests/master_test.cpp Sun Jun 5 09:22:12 2011
@@ -542,11 +542,8 @@ TEST(MasterTest, TaskRunning)
EXPECT_CALL(exec, shutdown(_))
.Times(1);
- ExecutorID executorId;
- executorId.set_value("default");
-
map<ExecutorID, Executor*> execs;
- execs[executorId] = &exec;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
TestingIsolationModule isolationModule(execs);
@@ -568,7 +565,7 @@ TEST(MasterTest, TaskRunning)
.WillOnce(Return(""));
EXPECT_CALL(sched, getExecutorInfo(&driver))
- .WillOnce(Return(CREATE_EXECUTOR_INFO(executorId, "noexecutor")));
+ .WillOnce(Return(DEFAULT_EXECUTOR_INFO));
EXPECT_CALL(sched, registered(&driver, _))
.Times(1);
@@ -638,11 +635,8 @@ TEST(MasterTest, KillTask)
EXPECT_CALL(exec, shutdown(_))
.Times(1);
- ExecutorID executorId;
- executorId.set_value("default");
-
map<ExecutorID, Executor*> execs;
- execs[executorId] = &exec;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
TestingIsolationModule isolationModule(execs);
@@ -664,7 +658,7 @@ TEST(MasterTest, KillTask)
.WillOnce(Return(""));
EXPECT_CALL(sched, getExecutorInfo(&driver))
- .WillOnce(Return(CREATE_EXECUTOR_INFO(executorId, "noexecutor")));
+ .WillOnce(Return(DEFAULT_EXECUTOR_INFO));
EXPECT_CALL(sched, registered(&driver, _))
.Times(1);
@@ -744,11 +738,8 @@ TEST(MasterTest, SchedulerFailoverStatus
EXPECT_CALL(exec, shutdown(_))
.Times(1);
- ExecutorID executorId;
- executorId.set_value("default");
-
map<ExecutorID, Executor*> execs;
- execs[executorId] = &exec;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
TestingIsolationModule isolationModule(execs);
@@ -773,7 +764,7 @@ TEST(MasterTest, SchedulerFailoverStatus
.WillOnce(Return(""));
EXPECT_CALL(sched1, getExecutorInfo(&driver1))
- .WillOnce(Return(CREATE_EXECUTOR_INFO(executorId, "noexecutor")));
+ .WillOnce(Return(DEFAULT_EXECUTOR_INFO));
EXPECT_CALL(sched1, registered(&driver1, _))
.WillOnce(SaveArg<1>(&frameworkId));
@@ -873,7 +864,7 @@ TEST(MasterTest, FrameworkMessage)
ExecutorDriver* execDriver;
ExecutorArgs args;
- FrameworkMessage execMessage;
+ string execData;
trigger execFrameworkMessageCall;
@@ -884,17 +875,14 @@ TEST(MasterTest, FrameworkMessage)
.Times(1);
EXPECT_CALL(exec, frameworkMessage(_, _))
- .WillOnce(DoAll(SaveArg<1>(&execMessage),
+ .WillOnce(DoAll(SaveArg<1>(&execData),
Trigger(&execFrameworkMessageCall)));
EXPECT_CALL(exec, shutdown(_))
.Times(1);
- ExecutorID executorId;
- executorId.set_value("default");
-
map<ExecutorID, Executor*> execs;
- execs[executorId] = &exec;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
TestingIsolationModule isolationModule(execs);
@@ -912,7 +900,7 @@ TEST(MasterTest, FrameworkMessage)
OfferID offerId;
vector<SlaveOffer> offers;
TaskStatus status;
- FrameworkMessage schedMessage;
+ string schedData;
trigger resourceOfferCall, statusUpdateCall, schedFrameworkMessageCall;
@@ -920,7 +908,7 @@ TEST(MasterTest, FrameworkMessage)
.WillOnce(Return(""));
EXPECT_CALL(sched, getExecutorInfo(&schedDriver))
- .WillOnce(Return(CREATE_EXECUTOR_INFO(executorId, "noexecutor")));
+ .WillOnce(Return(DEFAULT_EXECUTOR_INFO));
EXPECT_CALL(sched, registered(&schedDriver, _))
.Times(1);
@@ -933,8 +921,8 @@ TEST(MasterTest, FrameworkMessage)
EXPECT_CALL(sched, statusUpdate(&schedDriver, _))
.WillOnce(DoAll(SaveArg<1>(&status), Trigger(&statusUpdateCall)));
- EXPECT_CALL(sched, frameworkMessage(&schedDriver, _))
- .WillOnce(DoAll(SaveArg<1>(&schedMessage),
+ EXPECT_CALL(sched, frameworkMessage(&schedDriver, _, _, _))
+ .WillOnce(DoAll(SaveArg<3>(&schedData),
Trigger(&schedFrameworkMessageCall)));
schedDriver.start();
@@ -958,27 +946,23 @@ TEST(MasterTest, FrameworkMessage)
EXPECT_EQ(TASK_RUNNING, status.state());
- FrameworkMessage hello;
- hello.mutable_slave_id()->MergeFrom(offers[0].slave_id());
- hello.mutable_executor_id()->set_value("default"); // TODO(benh): No constant!
- hello.set_data("hello");
+ string hello = "hello";
- schedDriver.sendFrameworkMessage(hello);
+ schedDriver.sendFrameworkMessage(offers[0].slave_id(),
+ DEFAULT_EXECUTOR_ID,
+ hello);
WAIT_UNTIL(execFrameworkMessageCall);
- EXPECT_EQ("hello", execMessage.data());
+ EXPECT_EQ(hello, execData);
- FrameworkMessage reply;
- reply.mutable_slave_id()->MergeFrom(args.slave_id());
- reply.mutable_executor_id()->set_value("default"); // TODO(benh): No constant!
- reply.set_data("reply");
+ string reply = "reply";
execDriver->sendFrameworkMessage(reply);
WAIT_UNTIL(schedFrameworkMessageCall);
- EXPECT_EQ("reply", schedMessage.data());
+ EXPECT_EQ(reply, schedData);
schedDriver.stop();
schedDriver.join();
@@ -1013,11 +997,8 @@ TEST(MasterTest, SchedulerFailoverFramew
EXPECT_CALL(exec, shutdown(_))
.Times(1);
- ExecutorID executorId;
- executorId.set_value("default");
-
map<ExecutorID, Executor*> execs;
- execs[executorId] = &exec;
+ execs[DEFAULT_EXECUTOR_ID] = &exec;
TestingIsolationModule isolationModule(execs);
@@ -1040,7 +1021,7 @@ TEST(MasterTest, SchedulerFailoverFramew
.WillOnce(Return(""));
EXPECT_CALL(sched1, getExecutorInfo(&driver1))
- .WillOnce(Return(CREATE_EXECUTOR_INFO(executorId, "noexecutor")));
+ .WillOnce(Return(DEFAULT_EXECUTOR_INFO));
EXPECT_CALL(sched1, registered(&driver1, _))
.WillOnce(SaveArg<1>(&frameworkId));
@@ -1091,18 +1072,14 @@ TEST(MasterTest, SchedulerFailoverFramew
EXPECT_CALL(sched2, registered(&driver2, frameworkId))
.WillOnce(Trigger(&sched2RegisteredCall));
- EXPECT_CALL(sched2, frameworkMessage(&driver2, _))
+ EXPECT_CALL(sched2, frameworkMessage(&driver2, _, _, _))
.WillOnce(Trigger(&sched2FrameworkMessageCall));
driver2.start();
WAIT_UNTIL(sched2RegisteredCall);
- FrameworkMessage message;
- message.mutable_slave_id()->MergeFrom(offers[0].slave_id());
- message.mutable_executor_id()->set_value("default"); // TODO(benh): No constant!
-
- execDriver->sendFrameworkMessage(message);
+ execDriver->sendFrameworkMessage("");
WAIT_UNTIL(sched2FrameworkMessageCall);
Modified: incubator/mesos/trunk/src/tests/offer_reply_errors_test.cpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/offer_reply_errors_test.cpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/offer_reply_errors_test.cpp (original)
+++ incubator/mesos/trunk/src/tests/offer_reply_errors_test.cpp Sun Jun 5 09:22:12 2011
@@ -65,7 +65,6 @@ public:
virtual void registered(SchedulerDriver*, const FrameworkID&) {}
-
virtual void resourceOffer(SchedulerDriver* driver,
const OfferID& offerId,
const vector<SlaveOffer>& offers) {
@@ -81,7 +80,9 @@ public:
const TaskStatus& status) {}
virtual void frameworkMessage(SchedulerDriver* driver,
- const FrameworkMessage& message) {}
+ const SlaveID& slaveId,
+ const ExecutorID& executorId,
+ const string& data) {}
virtual void slaveLost(SchedulerDriver* driver, const SlaveID& sid) {}
Modified: incubator/mesos/trunk/src/tests/utils.hpp
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/src/tests/utils.hpp?rev=1132302&r1=1132301&r2=1132302&view=diff
==============================================================================
--- incubator/mesos/trunk/src/tests/utils.hpp (original)
+++ incubator/mesos/trunk/src/tests/utils.hpp Sun Jun 5 09:22:12 2011
@@ -54,6 +54,7 @@ void enterTestDirectory(const char* test
executor.set_uri("noexecutor"); \
executor; })
+
#define CREATE_EXECUTOR_INFO(executorId, uri) \
({ ExecutorInfo executor; \
executor.mutable_executor_id()->MergeFrom(executorId); \
@@ -61,6 +62,10 @@ void enterTestDirectory(const char* test
executor; })
+#define DEFAULT_EXECUTOR_ID \
+ DEFAULT_EXECUTOR_INFO.executor_id()
+
+
/**
* Definition of a mock Scheduler to be used in tests with gmock.
*/
@@ -74,8 +79,10 @@ public:
const std::vector<SlaveOffer>&));
MOCK_METHOD2(offerRescinded, void(SchedulerDriver*, const OfferID&));
MOCK_METHOD2(statusUpdate, void(SchedulerDriver*, const TaskStatus&));
- MOCK_METHOD2(frameworkMessage, void(SchedulerDriver*,
- const FrameworkMessage&));
+ MOCK_METHOD4(frameworkMessage, void(SchedulerDriver*,
+ const SlaveID&,
+ const ExecutorID&,
+ const std::string&));
MOCK_METHOD2(slaveLost, void(SchedulerDriver*, const SlaveID&));
MOCK_METHOD3(error, void(SchedulerDriver*, int, const std::string&));
};
@@ -90,7 +97,7 @@ public:
MOCK_METHOD2(init, void(ExecutorDriver*, const ExecutorArgs&));
MOCK_METHOD2(launchTask, void(ExecutorDriver*, const TaskDescription&));
MOCK_METHOD2(killTask, void(ExecutorDriver*, const TaskID&));
- MOCK_METHOD2(frameworkMessage, void(ExecutorDriver*, const FrameworkMessage&));
+ MOCK_METHOD2(frameworkMessage, void(ExecutorDriver*, const std::string&));
MOCK_METHOD1(shutdown, void(ExecutorDriver*));
MOCK_METHOD3(error, void(ExecutorDriver*, int, const std::string&));
};