Repository: mesos Updated Branches: refs/heads/master 536a681d3 -> 69187c749
Added missing `RESERVATION_REFINEMENT` capability to examples and tests. This is a follow-up to https://reviews.apache.org/r/60073/. We missed a few places in root tests and examples which aren't part of the test suite. Review: https://reviews.apache.org/r/60254 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/69187c74 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/69187c74 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/69187c74 Branch: refs/heads/master Commit: 69187c749f47bbebaaf1122de66d8e905d9a7c34 Parents: 536a681 Author: Michael Park <[email protected]> Authored: Tue Jun 20 16:16:37 2017 -0700 Committer: Michael Park <[email protected]> Committed: Tue Jun 20 18:07:19 2017 -0700 ---------------------------------------------------------------------- src/cli/execute.cpp | 6 ++++-- src/examples/balloon_framework.cpp | 2 ++ src/examples/docker_no_executor_framework.cpp | 2 ++ src/examples/load_generator_framework.cpp | 2 ++ src/examples/long_lived_framework.cpp | 2 ++ src/tests/containerizer/docker_containerizer_tests.cpp | 2 ++ 6 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/69187c74/src/cli/execute.cpp ---------------------------------------------------------------------- diff --git a/src/cli/execute.cpp b/src/cli/execute.cpp index 6ab0cb4..58eaa47 100644 --- a/src/cli/execute.cpp +++ b/src/cli/execute.cpp @@ -1036,8 +1036,10 @@ int main(int argc, char** argv) } // Always enable the TASK_KILLING_STATE capability. - vector<FrameworkInfo::Capability::Type> frameworkCapabilities = - { FrameworkInfo::Capability::TASK_KILLING_STATE }; + vector<FrameworkInfo::Capability::Type> frameworkCapabilities = { + FrameworkInfo::Capability::RESERVATION_REFINEMENT, + FrameworkInfo::Capability::TASK_KILLING_STATE, + }; // Enable PARTITION_AWARE unless disabled by the user. if (flags.partition_aware) { http://git-wip-us.apache.org/repos/asf/mesos/blob/69187c74/src/examples/balloon_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/balloon_framework.cpp b/src/examples/balloon_framework.cpp index 51b01cf..c4d071a 100644 --- a/src/examples/balloon_framework.cpp +++ b/src/examples/balloon_framework.cpp @@ -499,6 +499,8 @@ int main(int argc, char** argv) framework.set_name("Balloon Framework (C++)"); framework.set_checkpoint(flags.checkpoint); framework.set_role("*"); + framework.add_capabilities()->set_type( + FrameworkInfo::Capability::RESERVATION_REFINEMENT); BalloonScheduler scheduler(framework, executor, flags); http://git-wip-us.apache.org/repos/asf/mesos/blob/69187c74/src/examples/docker_no_executor_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/docker_no_executor_framework.cpp b/src/examples/docker_no_executor_framework.cpp index 657a02a..4a58f11 100644 --- a/src/examples/docker_no_executor_framework.cpp +++ b/src/examples/docker_no_executor_framework.cpp @@ -180,6 +180,8 @@ int main(int argc, char** argv) framework.set_user(""); // Have Mesos fill in the current user. framework.set_name("Docker No Executor Framework (C++)"); framework.set_checkpoint(true); + framework.add_capabilities()->set_type( + FrameworkInfo::Capability::RESERVATION_REFINEMENT); MesosSchedulerDriver* driver; if (os::getenv("MESOS_AUTHENTICATE_FRAMEWORKS").isSome()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/69187c74/src/examples/load_generator_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/load_generator_framework.cpp b/src/examples/load_generator_framework.cpp index 7f1ada5..abb70f4 100644 --- a/src/examples/load_generator_framework.cpp +++ b/src/examples/load_generator_framework.cpp @@ -324,6 +324,8 @@ int main(int argc, char** argv) FrameworkInfo framework; framework.set_user(""); // Have Mesos fill in the current user. framework.set_name("Load Generator Framework (C++)"); + framework.add_capabilities()->set_type( + FrameworkInfo::Capability::RESERVATION_REFINEMENT); const Option<string> checkpoint = os::getenv("MESOS_CHECKPOINT"); if (checkpoint.isSome()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/69187c74/src/examples/long_lived_framework.cpp ---------------------------------------------------------------------- diff --git a/src/examples/long_lived_framework.cpp b/src/examples/long_lived_framework.cpp index bdf20a7..bfc71c5 100644 --- a/src/examples/long_lived_framework.cpp +++ b/src/examples/long_lived_framework.cpp @@ -577,6 +577,8 @@ int main(int argc, char** argv) framework.set_user(os::user().get()); framework.set_name("Long Lived Framework (C++)"); framework.set_checkpoint(flags.checkpoint); + framework.add_capabilities()->set_type( + FrameworkInfo::Capability::RESERVATION_REFINEMENT); Option<Credential> credential = None(); http://git-wip-us.apache.org/repos/asf/mesos/blob/69187c74/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 8ac56ed..cf94702 100644 --- a/src/tests/containerizer/docker_containerizer_tests.cpp +++ b/src/tests/containerizer/docker_containerizer_tests.cpp @@ -4233,6 +4233,8 @@ TEST_F(DockerContainerizerTest, ROOT_DOCKER_Non_Root_Sandbox) framework.set_name("default"); framework.set_user("nobody"); framework.set_principal(DEFAULT_CREDENTIAL.principal()); + framework.add_capabilities()->set_type( + FrameworkInfo::Capability::RESERVATION_REFINEMENT); MockScheduler sched; MesosSchedulerDriver driver(
