Repository: mesos Updated Branches: refs/heads/master c7f723bf6 -> a0309709f
Inlined '_status' method in MesosContainerizer as a lambda. Review: https://reviews.apache.org/r/53463 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/78f84662 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/78f84662 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/78f84662 Branch: refs/heads/master Commit: 78f846628303e96beb2c3156ed3726b2df536e62 Parents: c7f723b Author: Jie Yu <yujie....@gmail.com> Authored: Thu Nov 3 14:27:03 2016 -0700 Committer: Jie Yu <yujie....@gmail.com> Committed: Mon Nov 7 16:28:02 2016 -0800 ---------------------------------------------------------------------- src/slave/containerizer/mesos/containerizer.cpp | 42 +++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/78f84662/src/slave/containerizer/mesos/containerizer.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/containerizer.cpp b/src/slave/containerizer/mesos/containerizer.cpp index 67cc595..c9ec92f 100644 --- a/src/slave/containerizer/mesos/containerizer.cpp +++ b/src/slave/containerizer/mesos/containerizer.cpp @@ -1875,29 +1875,6 @@ Future<ResourceStatistics> MesosContainerizerProcess::usage( } -Future<ContainerStatus> _status( - const ContainerID& containerId, - const list<Future<ContainerStatus>>& statuses) -{ - ContainerStatus result; - - foreach (const Future<ContainerStatus>& status, statuses) { - if (status.isReady()) { - result.MergeFrom(status.get()); - } else { - LOG(WARNING) << "Skipping status for container " - << containerId << " because: " - << (status.isFailed() ? status.failure() - : "discarded"); - } - } - - VLOG(2) << "Aggregating status for container " << containerId; - - return result; -} - - Future<ContainerStatus> MesosContainerizerProcess::status( const ContainerID& containerId) { @@ -1927,7 +1904,24 @@ Future<ContainerStatus> MesosContainerizerProcess::status( return containers_.at(containerId)->sequence.add<ContainerStatus>( [=]() -> Future<ContainerStatus> { return await(futures) - .then(lambda::bind(_status, containerId, lambda::_1)); + .then([containerId](const list<Future<ContainerStatus>>& statuses) { + ContainerStatus result; + + foreach (const Future<ContainerStatus>& status, statuses) { + if (status.isReady()) { + result.MergeFrom(status.get()); + } else { + LOG(WARNING) << "Skipping status for container " + << containerId << " because: " + << (status.isFailed() ? status.failure() + : "discarded"); + } + } + + VLOG(2) << "Aggregating status for container " << containerId; + + return result; + }); }); }
