This is an automated email from the ASF dual-hosted git repository. bbannier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mesos.git
commit bc4606c25502ae713409827d973b26da3f8be3e1 Author: Benjamin Bannier <[email protected]> AuthorDate: Wed Mar 27 09:40:02 2019 +0100 Made hashmap::containsValue consistent with stout naming convention. In stout we use snake case, not camel case. This patch contains fixes to users in Mesos. Review: https://reviews.apache.org/r/70250/ --- src/master/master.cpp | 2 +- src/slave/containerizer/docker.cpp | 2 +- src/slave/containerizer/mesos/launcher.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/master/master.cpp b/src/master/master.cpp index c519d5a..acc67d3 100644 --- a/src/master/master.cpp +++ b/src/master/master.cpp @@ -10930,7 +10930,7 @@ void Master::removeFramework(Framework* framework) // Remove the metrics for the principal if this framework is the // last one with this principal. if (principal.isSome() && - !frameworks.principals.containsValue(principal.get())) { + !frameworks.principals.contains_value(principal.get())) { CHECK(metrics->frameworks.contains(principal.get())); metrics->frameworks.erase(principal.get()); } diff --git a/src/slave/containerizer/docker.cpp b/src/slave/containerizer/docker.cpp index fc29e20..7f1d471 100644 --- a/src/slave/containerizer/docker.cpp +++ b/src/slave/containerizer/docker.cpp @@ -1056,7 +1056,7 @@ Future<Nothing> DockerContainerizerProcess::_recover( container->status.future() ->onAny(defer(self(), &Self::reaped, containerId)); - if (pids.containsValue(pid)) { + if (pids.contains_value(pid)) { // This should (almost) never occur. There is the // possibility that a new executor is launched with the same // pid as one that just exited (highly unlikely) and the diff --git a/src/slave/containerizer/mesos/launcher.cpp b/src/slave/containerizer/mesos/launcher.cpp index b38f88d..413cc62 100644 --- a/src/slave/containerizer/mesos/launcher.cpp +++ b/src/slave/containerizer/mesos/launcher.cpp @@ -61,7 +61,7 @@ Future<hashset<ContainerID>> SubprocessLauncher::recover( const ContainerID& containerId = state.container_id(); pid_t pid = static_cast<pid_t>(state.pid()); - if (pids.containsValue(pid)) { + if (pids.contains_value(pid)) { // This should (almost) never occur. There is the possibility // that a new executor is launched with the same pid as one that // just exited (highly unlikely) and the slave dies after the
