You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by ne...@apache.org on 2017/05/24 22:20:57 UTC
[6/8] mesos git commit: Cleaned up allocator benchmark tests.
Cleaned up allocator benchmark tests.
Review: https://reviews.apache.org/r/59538
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/07a339f4
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/07a339f4
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/07a339f4
Branch: refs/heads/1.3.x
Commit: 07a339f41a929a0f04393b9ece1573fc61aaa2b6
Parents: 89aaa05
Author: Neil Conway <ne...@gmail.com>
Authored: Wed May 24 13:19:55 2017 -0700
Committer: Neil Conway <ne...@gmail.com>
Committed: Wed May 24 15:19:15 2017 -0700
----------------------------------------------------------------------
src/tests/hierarchical_allocator_tests.cpp | 36 ++++++++++++++-----------
1 file changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/07a339f4/src/tests/hierarchical_allocator_tests.cpp
----------------------------------------------------------------------
diff --git a/src/tests/hierarchical_allocator_tests.cpp b/src/tests/hierarchical_allocator_tests.cpp
index 2f23080..68b01cd 100644
--- a/src/tests/hierarchical_allocator_tests.cpp
+++ b/src/tests/hierarchical_allocator_tests.cpp
@@ -4886,9 +4886,9 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, AddAndUpdateSlave)
// Add the slaves, use round-robin to choose which framework
// to allocate a slice of the slave's resources to.
for (size_t i = 0; i < slaves.size(); i++) {
- hashmap<FrameworkID, Resources> used;
-
- used[frameworks[i % frameworkCount].id()] = allocation;
+ hashmap<FrameworkID, Resources> used = {
+ {frameworks[i % frameworkCount].id(), allocation}
+ };
allocator->addSlave(
slaves[i].id(),
@@ -5011,10 +5011,12 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, DeclineOffers)
for (size_t i = 0; i < slaveCount; i++) {
slaves.push_back(createSlaveInfo(agentResources));
- // Add some used resources on each slave. Let's say there are 16 tasks, each
- // is allocated 1 cpu and a random port from the port range.
- hashmap<FrameworkID, Resources> used;
- used[frameworks[i % frameworkCount].id()] = allocation;
+ // Add some used resources on each slave. Let's say there are 16 tasks;
+ // each is allocated 1 cpu and a random port from the port range.
+ hashmap<FrameworkID, Resources> used = {
+ {frameworks[i % frameworkCount].id(), allocation}
+ };
+
allocator->addSlave(
slaves[i].id(),
slaves[i],
@@ -5204,8 +5206,10 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, ResourceLabels)
// Add some used resources on each slave. Let's say there are 16 tasks, each
// is allocated 1 cpu and a random port from the port range.
- hashmap<FrameworkID, Resources> used;
- used[frameworks[i % frameworkCount].id()] = _allocation;
+ hashmap<FrameworkID, Resources> used = {
+ {frameworks[i % frameworkCount].id(), _allocation}
+ };
+
allocator->addSlave(
slaves[i].id(),
slaves[i],
@@ -5339,8 +5343,9 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, SuppressOffers)
for (size_t i = 0; i < agentCount; i++) {
agents.push_back(createSlaveInfo(agentResources));
- hashmap<FrameworkID, Resources> used;
- used[frameworks[i % frameworkCount].id()] = allocation;
+ hashmap<FrameworkID, Resources> used = {
+ {frameworks[i % frameworkCount].id(), allocation}
+ };
allocator->addSlave(
agents[i].id(),
@@ -5369,7 +5374,7 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, SuppressOffers)
size_t allocationsCount = 5;
size_t suppressCount = 0;
- for (size_t i = 0; i < allocationsCount; ++i) {
+ for (size_t i = 0; i < allocationsCount; i++) {
// Recover resources with no filters because we want to test the
// effect of suppression alone.
foreach (const OfferedResources& offer, offers) {
@@ -5495,8 +5500,9 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, ExtremeSuppressOffers)
for (size_t i = 0; i < agentCount; i++) {
agents.push_back(createSlaveInfo(agentResources));
- hashmap<FrameworkID, Resources> used;
- used[frameworks[i % frameworkCount].id()] = allocation;
+ hashmap<FrameworkID, Resources> used = {
+ {frameworks[i % frameworkCount].id(), allocation}
+ };
allocator->addSlave(
agents[i].id(),
@@ -5532,7 +5538,7 @@ TEST_P(HierarchicalAllocator_BENCHMARK_Test, ExtremeSuppressOffers)
allocator->suppressOffers(frameworks[i].id(), {});
}
- for (size_t i = 0; i < allocationsCount; ++i) {
+ for (size_t i = 0; i < allocationsCount; i++) {
// Recover resources with no filters because we want to test the
// effect of suppression alone.
foreach (const OfferedResources& offer, offers) {