Removed authentication from example event call framework. Review: https://reviews.apache.org/r/37300
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5c8c46af Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5c8c46af Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5c8c46af Branch: refs/heads/master Commit: 5c8c46af073959c66ea0c42f541ba8aabcdc4898 Parents: 876e0b2 Author: Anand Mazumdar <[email protected]> Authored: Mon Aug 10 21:01:43 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Mon Aug 10 21:01:43 2015 -0700 ---------------------------------------------------------------------- src/examples/event_call_framework.cpp | 35 ++++++----------------------- src/tests/event_call_framework_test.sh | 3 +++ 2 files changed, 10 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5c8c46af/src/examples/event_call_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/event_call_framework.cpp b/src/examples/event_call_framework.cpp index b1187aa..019e5c1 100644 --- a/src/examples/event_call_framework.cpp +++ b/src/examples/event_call_framework.cpp @@ -90,7 +90,6 @@ public: : framework(_framework), executor(_executor), mesos(master, - credential, process::defer(self(), &Self::connected), process::defer(self(), &Self::disconnected), process::defer(self(), &Self::received, lambda::_1)), @@ -419,35 +418,15 @@ int main(int argc, char** argv) executor.set_name("Test Executor (C++)"); executor.set_source("cpp_test"); - EventCallScheduler* scheduler; - if (os::getenv("MESOS_AUTHENTICATE").isSome()) { - cout << "Enabling authentication for the scheduler" << endl; - - value = os::getenv("DEFAULT_PRINCIPAL"); - if (value.isNone()) { - EXIT(1) << "Expecting authentication principal in the environment"; - } - - Credential credential; - credential.set_principal(value.get()); - - framework.set_principal(value.get()); - - value = os::getenv("DEFAULT_SECRET"); - if (value.isNone()) { - EXIT(1) << "Expecting authentication secret in the environment"; - } - - credential.set_secret(value.get()); + value = os::getenv("DEFAULT_PRINCIPAL"); + if (value.isNone()) { + EXIT(1) << "Expecting authentication principal in the environment"; + } - scheduler = - new EventCallScheduler(framework, executor, master.get(), credential); - } else { - framework.set_principal("event-call-scheduler-cpp"); + framework.set_principal(value.get()); - scheduler = - new EventCallScheduler(framework, executor, master.get()); - } + EventCallScheduler* scheduler; + scheduler = new EventCallScheduler(framework, executor, master.get()); process::spawn(scheduler); process::wait(scheduler); http://git-wip-us.apache.org/repos/asf/mesos/blob/5c8c46af/src/tests/event_call_framework_test.sh ---------------------------------------------------------------------- diff --git a/src/tests/event_call_framework_test.sh b/src/tests/event_call_framework_test.sh index e42c4e8..8eb3041 100755 --- a/src/tests/event_call_framework_test.sh +++ b/src/tests/event_call_framework_test.sh @@ -27,5 +27,8 @@ export MESOS_NUM_SLAVES=3 # Set resources for the slave. export MESOS_RESOURCES="cpus:2;mem:10240" +# Disable authentication as the scheduler library does not support it. +export MESOS_AUTHENTICATE=false + # Check that the C++ low level scheduler executes without crashing (returns 0). exec ${MESOS_BUILD_DIR}/src/event-call-framework --master=local
