Repository: mesos Updated Branches: refs/heads/master 6839897c5 -> 4d2c30453
Correctly updated total resources when agent capabilities changed. Due to the short-circuiting behaviour of C++ boolean operations, an agent that re-registers with changed agent capabilities would not have its total updated. Review: https://reviews.apache.org/r/64342/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4d2c3045 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4d2c3045 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4d2c3045 Branch: refs/heads/master Commit: 4d2c30453d862e8e9197322881b3d29915850ede Parents: 6839897 Author: Benno Evers <bev...@mesosphere.com> Authored: Tue Dec 5 20:53:53 2017 +0100 Committer: Alexander Rukletsov <al...@apache.org> Committed: Tue Dec 5 20:55:51 2017 +0100 ---------------------------------------------------------------------- src/master/allocator/mesos/hierarchical.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4d2c3045/src/master/allocator/mesos/hierarchical.cpp ---------------------------------------------------------------------- diff --git a/src/master/allocator/mesos/hierarchical.cpp b/src/master/allocator/mesos/hierarchical.cpp index 4428541..4bc9fb6 100644 --- a/src/master/allocator/mesos/hierarchical.cpp +++ b/src/master/allocator/mesos/hierarchical.cpp @@ -641,7 +641,7 @@ void HierarchicalAllocatorProcess::updateSlave( } if (total.isSome()) { - updated = updated || updateSlaveTotal(slaveId, total.get()); + updated = updateSlaveTotal(slaveId, total.get()) || updated; LOG(INFO) << "Agent " << slaveId << " (" << slave.hostname << ")" << " updated with total resources " << total.get();
