Replaced term "periodic allocation" for consistency. Though "periodic allocation" may be a better name, we use "batch allocation" in the hierarchical allocator and some other tests. For consistency, rename all occurrences in the code.
Review: https://reviews.apache.org/r/42636/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/18b5a852 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/18b5a852 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/18b5a852 Branch: refs/heads/master Commit: 18b5a852e0362deb3d091a28c9bfaf5515f28021 Parents: d1831a2 Author: Alexander Rukletsov <[email protected]> Authored: Tue Feb 9 18:32:27 2016 +0100 Committer: Benjamin Mahler <[email protected]> Committed: Tue Feb 9 20:00:42 2016 +0100 ---------------------------------------------------------------------- src/tests/hierarchical_allocator_tests.cpp | 50 ++++++++++++------------- 1 file changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/18b5a852/src/tests/hierarchical_allocator_tests.cpp ---------------------------------------------------------------------- diff --git a/src/tests/hierarchical_allocator_tests.cpp b/src/tests/hierarchical_allocator_tests.cpp index 0acfc09..60ab7ee 100644 --- a/src/tests/hierarchical_allocator_tests.cpp +++ b/src/tests/hierarchical_allocator_tests.cpp @@ -253,7 +253,7 @@ class HierarchicalAllocatorTest : public HierarchicalAllocatorTestBase {}; TEST_F(HierarchicalAllocatorTest, UnreservedDRF) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -377,7 +377,7 @@ TEST_F(HierarchicalAllocatorTest, UnreservedDRF) TEST_F(HierarchicalAllocatorTest, ReservedDRF) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -680,9 +680,9 @@ TEST_F(HierarchicalAllocatorTest, SmallOfferFilterTimeout) // properly sent inverse offers after they have accepted or reserved resources. TEST_F(HierarchicalAllocatorTest, MaintenanceInverseOffers) { - // Pausing the clock is not necessary, but ensures that the test doesn't rely - // on the periodic allocation in the allocator, which would slow down the - // test. + // Pausing the clock is not necessary, but ensures that the test + // doesn't rely on the batch allocation in the allocator, which + // would slow down the test. Clock::pause(); initialize(); @@ -977,7 +977,7 @@ TEST_F(HierarchicalAllocatorTest, RecoverResources) TEST_F(HierarchicalAllocatorTest, Allocatable) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -1201,7 +1201,7 @@ TEST_F(HierarchicalAllocatorTest, UpdateAvailableFail) // subsequent allocations properly account for that. TEST_F(HierarchicalAllocatorTest, UpdateSlave) { - // Pause clock to disable periodic allocation. + // Pause clock to disable batch allocation. Clock::pause(); initialize(); @@ -1259,7 +1259,7 @@ TEST_F(HierarchicalAllocatorTest, UpdateSlave) // revocable resources do not get allocated oversubscribed resources. TEST_F(HierarchicalAllocatorTest, OversubscribedNotAllocated) { - // Pause clock to disable periodic allocation. + // Pause clock to disable batch allocation. Clock::pause(); initialize(); @@ -1295,7 +1295,7 @@ TEST_F(HierarchicalAllocatorTest, OversubscribedNotAllocated) // recovered subsequent allocation properly accounts for that. TEST_F(HierarchicalAllocatorTest, RecoverOversubscribedResources) { - // Pause clock to disable periodic allocation. + // Pause clock to disable batch allocation. Clock::pause(); initialize(); @@ -1416,7 +1416,7 @@ TEST_F(HierarchicalAllocatorTest, Whitelist) TEST_F(HierarchicalAllocatorTest, QuotaProvidesQuarantee) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -1497,7 +1497,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaProvidesQuarantee) // framework2 share = 0 // Assuming the default batch allocation interval is less than 5 seconds, - // all periodic allocations that happen while the refuse filter is active + // all batch allocations that happen while the refuse filter is active // should yield no new allocations. ASSERT_LT(flags.allocation_interval.secs(), filter5s.refuse_seconds()); Clock::advance(flags.allocation_interval); @@ -1517,7 +1517,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaProvidesQuarantee) Clock::advance(Duration::create(filter5s.refuse_seconds()).get()); Clock::settle(); - // Trigger the next periodic allocation. It should offer the previously + // Trigger the next batch allocation. It should offer the previously // declined resources to the quota'ed role. Clock::advance(flags.allocation_interval); Clock::settle(); @@ -1540,7 +1540,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaProvidesQuarantee) TEST_F(HierarchicalAllocatorTest, RemoveQuota) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -1610,7 +1610,7 @@ TEST_F(HierarchicalAllocatorTest, RemoveQuota) agent1.resources(), None()); - // Trigger the next periodic allocation. + // Trigger the next batch allocation. Clock::advance(flags.allocation_interval); Clock::settle(); @@ -1634,7 +1634,7 @@ TEST_F(HierarchicalAllocatorTest, RemoveQuota) TEST_F(HierarchicalAllocatorTest, MultipleFrameworksInRoleWithQuota) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -1730,7 +1730,7 @@ TEST_F(HierarchicalAllocatorTest, MultipleFrameworksInRoleWithQuota) agent3.resources(), filter5s); - // Trigger the next periodic allocation. + // Trigger the next batch allocation. Clock::advance(flags.allocation_interval); Clock::settle(); @@ -1755,7 +1755,7 @@ TEST_F(HierarchicalAllocatorTest, MultipleFrameworksInRoleWithQuota) TEST_F(HierarchicalAllocatorTest, QuotaAllocationGranularity) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -1811,7 +1811,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaAllocationGranularity) TEST_F(HierarchicalAllocatorTest, DRFWithQuota) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -1909,7 +1909,7 @@ TEST_F(HierarchicalAllocatorTest, DRFWithQuota) TEST_F(HierarchicalAllocatorTest, QuotaAgainstStarvation) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -1993,7 +1993,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaAgainstStarvation) // NO_QUOTA_ROLE share = 0 // framework2 share = 0 - // Trigger the next periodic allocation. + // Trigger the next batch allocation. Clock::advance(flags.allocation_interval); Clock::settle(); @@ -2036,7 +2036,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaAgainstStarvation) TEST_F(HierarchicalAllocatorTest, QuotaAbsentFramework) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -2115,7 +2115,7 @@ TEST_F(HierarchicalAllocatorTest, QuotaAbsentFramework) TEST_F(HierarchicalAllocatorTest, MultiQuotaAbsentFrameworks) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -2160,7 +2160,7 @@ TEST_F(HierarchicalAllocatorTest, MultiQuotaAbsentFrameworks) TEST_F(HierarchicalAllocatorTest, MultiQuotaWithFrameworks) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -2249,7 +2249,7 @@ TEST_F(HierarchicalAllocatorTest, MultiQuotaWithFrameworks) TEST_F(HierarchicalAllocatorTest, ReservationWithinQuota) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause(); @@ -2325,7 +2325,7 @@ TEST_F(HierarchicalAllocatorTest, ReservationWithinQuota) TEST_F(HierarchicalAllocatorTest, DeactivateAndReactivateFramework) { // Pausing the clock is not necessary, but ensures that the test - // doesn't rely on the periodic allocation in the allocator, which + // doesn't rely on the batch allocation in the allocator, which // would slow down the test. Clock::pause();
