You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ji...@apache.org on 2016/10/31 23:48:48 UTC
mesos git commit: Fixed rlimit test for execution under OS X.
Repository: mesos
Updated Branches:
refs/heads/master 153e83486 -> b5683f234
Fixed rlimit test for execution under OS X.
The previously use RLIMIT_NOFILE is ignored under OS X; use RLIMIT_CPU
instead.
Review: https://reviews.apache.org/r/53301/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b5683f23
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b5683f23
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b5683f23
Branch: refs/heads/master
Commit: b5683f234854e22f9696f6b8bb6aab6819f9d36f
Parents: 153e834
Author: Benjamin Bannier <be...@mesosphere.io>
Authored: Mon Oct 31 16:42:17 2016 -0700
Committer: Jie Yu <yu...@gmail.com>
Committed: Mon Oct 31 16:42:17 2016 -0700
----------------------------------------------------------------------
src/tests/containerizer/posix_rlimits_isolator_tests.cpp | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/b5683f23/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/containerizer/posix_rlimits_isolator_tests.cpp b/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
index c20e7fb..24b19d9 100644
--- a/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
+++ b/src/tests/containerizer/posix_rlimits_isolator_tests.cpp
@@ -87,19 +87,21 @@ TEST_F(PosixRLimitsIsolatorTest, TaskExceedingLimit)
AWAIT_READY(offers);
ASSERT_NE(0u, offers->size());
+ // The task attempts to use an infinite amount of CPU time.
TaskInfo task = createTask(
offers.get()[0].slave_id(),
offers.get()[0].resources(),
- "dd if=/dev/zero of=file bs=1024 count=8");
+ "while true; do true; done");
ContainerInfo* container = task.mutable_container();
container->set_type(ContainerInfo::MESOS);
+ // Limit the process to use maximally 1 second of CPU time.
RLimitInfo rlimitInfo;
RLimitInfo::RLimit* cpuLimit = rlimitInfo.add_rlimits();
- cpuLimit->set_type(RLimitInfo::RLimit::RLMT_FSIZE);
- cpuLimit->set_soft(1024);
- cpuLimit->set_hard(1024);
+ cpuLimit->set_type(RLimitInfo::RLimit::RLMT_CPU);
+ cpuLimit->set_soft(1);
+ cpuLimit->set_hard(1);
container->mutable_rlimit_info()->CopyFrom(rlimitInfo);