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 2017/12/13 01:48:53 UTC
mesos git commit: Moved a comment in the allocator to a more relevant
location.
Repository: mesos
Updated Branches:
refs/heads/master 2df68b4b2 -> 99171a4c1
Moved a comment in the allocator to a more relevant location.
Review: https://reviews.apache.org/r/64562/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/99171a4c
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/99171a4c
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/99171a4c
Branch: refs/heads/master
Commit: 99171a4c1625ea93bda5edacca35614d09d58729
Parents: 2df68b4
Author: Meng Zhu <mz...@mesosphere.io>
Authored: Tue Dec 12 17:47:56 2017 -0800
Committer: Benjamin Mahler <bm...@apache.org>
Committed: Tue Dec 12 17:47:56 2017 -0800
----------------------------------------------------------------------
src/master/allocator/mesos/hierarchical.cpp | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/99171a4c/src/master/allocator/mesos/hierarchical.cpp
----------------------------------------------------------------------
diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp
index 2b5f114..2b2d1fd 100644
--- a/src/master/allocator/mesos/hierarchical.cpp
+++ b/src/master/allocator/mesos/hierarchical.cpp
@@ -1926,13 +1926,12 @@ void HierarchicalAllocatorProcess::__allocate()
// Calculate the currently available resources on the slave, which
// is the difference in non-shared resources between total and
// allocated, plus all shared resources on the agent (if applicable).
- // Since shared resources are offerable even when they are in use, we
- // make one copy of the shared resources available regardless of the
- // past allocations.
Resources available = slave.available().nonShared();
- // Offer a shared resource only if it has not been offered in
- // this offer cycle to a framework.
+ // Since shared resources are offerable even when they are in use, we
+ // make one copy of the shared resources available regardless of the
+ // past allocations. Offer a shared resource only if it has not been
+ // offered in this offer cycle to a framework.
if (framework.capabilities.sharedResources) {
available += slave.total.shared();
if (offeredSharedResources.contains(slaveId)) {