Repository: mesos Updated Branches: refs/heads/master d1207a151 -> 24359e643
Renamed an ambiguous variable in the `network/ports` isolator. Review: https://reviews.apache.org/r/67271/ Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4f95d751 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4f95d751 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4f95d751 Branch: refs/heads/master Commit: 4f95d751b0e890bbc6ede3d2adc8d920c6b1c714 Parents: d1207a1 Author: Xudong Ni <[email protected]> Authored: Thu May 24 17:06:34 2018 -0700 Committer: James Peach <[email protected]> Committed: Thu May 24 17:10:42 2018 -0700 ---------------------------------------------------------------------- .../containerizer/mesos/isolators/network/ports.cpp | 13 ++++++++----- .../containerizer/mesos/isolators/network/ports.hpp | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/4f95d751/src/slave/containerizer/mesos/isolators/network/ports.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/network/ports.cpp b/src/slave/containerizer/mesos/isolators/network/ports.cpp index 1f84ed4..53e894d 100644 --- a/src/slave/containerizer/mesos/isolators/network/ports.cpp +++ b/src/slave/containerizer/mesos/isolators/network/ports.cpp @@ -522,12 +522,13 @@ Future<Nothing> NetworkPortsIsolatorProcess::update( Option<Value::Ranges> ports = resources.ports(); if (ports.isSome()) { const Owned<Info>& info = infos.at(containerId); - info->ports = rangesToIntervalSet<uint16_t>(ports.get()).get(); + info->allocatedPorts = rangesToIntervalSet<uint16_t>(ports.get()).get(); } else { - info->ports = IntervalSet<uint16_t>(); + info->allocatedPorts = IntervalSet<uint16_t>(); } - LOG(INFO) << "Updated ports to " << intervalSetToRanges(info->ports.get()) + LOG(INFO) << "Updated ports to " + << intervalSetToRanges(info->allocatedPorts.get()) << " for container " << containerId; return Nothing(); @@ -568,8 +569,10 @@ Future<Nothing> NetworkPortsIsolatorProcess::check( // for this container. const Owned<Info>& info = infos.at(rootContainerId); - if (info->ports.isSome() && !info->ports->contains(ports)) { - const IntervalSet<uint16_t> unallocatedPorts = ports - info->ports.get(); + if (info->allocatedPorts.isSome() && + !info->allocatedPorts->contains(ports)) { + const IntervalSet<uint16_t> unallocatedPorts = + ports - info->allocatedPorts.get(); Resource resource; resource.set_name("ports"); http://git-wip-us.apache.org/repos/asf/mesos/blob/4f95d751/src/slave/containerizer/mesos/isolators/network/ports.hpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/mesos/isolators/network/ports.hpp b/src/slave/containerizer/mesos/isolators/network/ports.hpp index ba71087..d9a97d1 100644 --- a/src/slave/containerizer/mesos/isolators/network/ports.hpp +++ b/src/slave/containerizer/mesos/isolators/network/ports.hpp @@ -91,7 +91,7 @@ private: struct Info { - Option<IntervalSet<uint16_t>> ports; + Option<IntervalSet<uint16_t>> allocatedPorts; process::Promise<mesos::slave::ContainerLimitation> limitation; };
