Repository: mesos Updated Branches: refs/heads/master 42711bce9 -> e70713f44
Reverted "Added a test case `ROOT_CGROUPS_CFS_BigQuotaDecimal`.". This reverts commit 6cfa4a6f07f61c9b5edc5cce4b778fdf58baa81a. Review: https://reviews.apache.org/r/51882/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e70713f4 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e70713f4 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e70713f4 Branch: refs/heads/master Commit: e70713f44fd1f754067d6a1c00bea0a2db1206c2 Parents: 42711bc Author: haosdent huang <haosd...@gmail.com> Authored: Wed Sep 14 19:06:29 2016 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Wed Sep 14 19:06:29 2016 -0700 ---------------------------------------------------------------------- src/tests/containerizer/cgroups_isolator_tests.cpp | 2 ++ src/tests/containerizer/cgroups_tests.cpp | 17 +---------------- 2 files changed, 3 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/e70713f4/src/tests/containerizer/cgroups_isolator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/cgroups_isolator_tests.cpp b/src/tests/containerizer/cgroups_isolator_tests.cpp index 5f39cc3..702181d 100644 --- a/src/tests/containerizer/cgroups_isolator_tests.cpp +++ b/src/tests/containerizer/cgroups_isolator_tests.cpp @@ -192,6 +192,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_PERF_NET_CLS_UserCgroup) foreach (const string& subsystem, subsystems) { Result<string> hierarchy = cgroups::hierarchy(subsystem); ASSERT_SOME(hierarchy); + string cgroup = path::join(flags.cgroups_root, containerId.value()); // Verify that the user cannot manipulate the container's cgroup @@ -321,6 +322,7 @@ TEST_F(CgroupsIsolatorTest, ROOT_CGROUPS_RevocableCpu) Result<string> cpuHierarchy = cgroups::hierarchy("cpu"); ASSERT_SOME(cpuHierarchy); + string cpuCgroup= path::join(flags.cgroups_root, containerId.value()); double totalCpus = cpus.cpus().get() + DEFAULT_EXECUTOR_CPUS; http://git-wip-us.apache.org/repos/asf/mesos/blob/e70713f4/src/tests/containerizer/cgroups_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/containerizer/cgroups_tests.cpp b/src/tests/containerizer/cgroups_tests.cpp index 6ebcebb..821c786 100644 --- a/src/tests/containerizer/cgroups_tests.cpp +++ b/src/tests/containerizer/cgroups_tests.cpp @@ -509,7 +509,7 @@ TEST_F(CgroupsAnyHierarchyTest, ROOT_CGROUPS_Write) } -TEST_F(CgroupsAnyHierarchyTest, ROOT_CGROUPS_CFS_BigQuota) +TEST_F(CgroupsAnyHierarchyTest, ROOT_CGROUPS_CFS_Big_Quota) { string hierarchy = path::join(baseHierarchy, "cpu"); ASSERT_SOME(cgroups::create(hierarchy, TEST_CGROUPS_ROOT)); @@ -524,21 +524,6 @@ TEST_F(CgroupsAnyHierarchyTest, ROOT_CGROUPS_CFS_BigQuota) } -TEST_F(CgroupsAnyHierarchyTest, ROOT_CGROUPS_CFS_BigQuotaDecimal) -{ - string hierarchy = path::join(baseHierarchy, "cpu"); - ASSERT_SOME(cgroups::create(hierarchy, TEST_CGROUPS_ROOT)); - - Duration quota = Seconds(100.5); // Big quota with decimal. - ASSERT_SOME(cgroups::cpu::cfs_quota_us(hierarchy, TEST_CGROUPS_ROOT, quota)); - - // Ensure we can read back the correct quota. - ASSERT_SOME_EQ( - quota, - cgroups::cpu::cfs_quota_us(hierarchy, TEST_CGROUPS_ROOT)); -} - - class CgroupsAnyHierarchyWithCpuAcctMemoryTest : public CgroupsAnyHierarchyTest {
