You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by jo...@apache.org on 2016/01/16 23:47:33 UTC
[2/2] mesos git commit: Quota: Checked whether the remaining cluster
resources is allocatable.
Quota: Checked whether the remaining cluster resources is allocatable.
Review: https://reviews.apache.org/r/42254/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/36c1b00e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/36c1b00e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/36c1b00e
Branch: refs/heads/master
Commit: 36c1b00ea5ad9b072f9cc78dde10eb424bd50295
Parents: d913563
Author: Klaus Ma <kl...@gmail.com>
Authored: Sat Jan 16 17:41:09 2016 -0500
Committer: Joris Van Remoortere <jo...@gmail.com>
Committed: Sat Jan 16 17:41:09 2016 -0500
----------------------------------------------------------------------
src/master/allocator/mesos/hierarchical.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/36c1b00e/src/master/allocator/mesos/hierarchical.cpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp
index 6207a0e..b71e2c8 100644
--- a/src/master/allocator/mesos/hierarchical.cpp
+++ b/src/master/allocator/mesos/hierarchical.cpp
@@ -1252,7 +1252,7 @@ void HierarchicalAllocatorProcess::allocate(
// Proceed with allocating the remaining free pool.
foreach (const SlaveID& slaveId, slaveIds) {
// If there are no resources available for the second stage, stop.
- if ((remainingClusterResources - allocatedStage2).empty()) {
+ if (!allocatable(remainingClusterResources - allocatedStage2)) {
break;
}