You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by bm...@apache.org on 2014/12/19 03:04:26 UTC
mesos git commit: Replaced a bad allocator CHECK with a TODO.
Repository: mesos
Updated Branches:
refs/heads/master 4c9813f2b -> cd7019cd9
Replaced a bad allocator CHECK with a TODO.
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/cd7019cd
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/cd7019cd
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/cd7019cd
Branch: refs/heads/master
Commit: cd7019cd95946ad246c308e0c5e0849103776f56
Parents: 4c9813f
Author: Benjamin Mahler <be...@gmail.com>
Authored: Thu Dec 18 18:04:06 2014 -0800
Committer: Benjamin Mahler <be...@gmail.com>
Committed: Thu Dec 18 18:04:12 2014 -0800
----------------------------------------------------------------------
src/master/hierarchical_allocator_process.hpp | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/cd7019cd/src/master/hierarchical_allocator_process.hpp
----------------------------------------------------------------------
diff --git a/src/master/hierarchical_allocator_process.hpp b/src/master/hierarchical_allocator_process.hpp
index 12eb1d1..6e2e958 100644
--- a/src/master/hierarchical_allocator_process.hpp
+++ b/src/master/hierarchical_allocator_process.hpp
@@ -603,9 +603,12 @@ HierarchicalAllocatorProcess<RoleSorter, FrameworkSorter>::transformAllocation(
slaves[slaveId].total = transformedTotal.get();
- // The available resources should be unaffected.
- CHECK_EQ(slaves[slaveId].total - transformedAllocation.get(),
- slaves[slaveId].available);
+ // TODO(bmahler): Validate that the available resources are
+ // unaffected. This requires augmenting the sorters with
+ // SlaveIDs for allocations, so that we can do:
+ //
+ // CHECK_EQ(slaves[slaveId].total - transformedSlaveAllocation,
+ // slaves[slaveId].available);
LOG(INFO) << "Updated allocation of framework " << frameworkId
<< " on slave " << slaveId