Repository: mesos Updated Branches: refs/heads/master 2053dfa11 -> 8b365a487
Fixed a bug in port mapping isolator which will cause SIGABRT during slave recovery. Review: https://reviews.apache.org/r/33631 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8b365a48 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8b365a48 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8b365a48 Branch: refs/heads/master Commit: 8b365a487957b334d04094b7de74e56b86439d47 Parents: 2053dfa Author: Jie Yu <[email protected]> Authored: Tue Apr 28 10:52:56 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Tue Apr 28 11:35:10 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/network/port_mapping.cpp | 2 ++ 1 file changed, 2 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8b365a48/src/slave/containerizer/isolators/network/port_mapping.cpp ---------------------------------------------------------------------- diff --git a/src/slave/containerizer/isolators/network/port_mapping.cpp b/src/slave/containerizer/isolators/network/port_mapping.cpp index 24cb4ba..fc0fa4c 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -1478,6 +1478,8 @@ Future<Nothing> PortMappingIsolatorProcess::recover( // We ignore files that are clearly not network namespace // handles created by us. It's likely that those are created by // users or other tools. + LOG(WARNING) << "Unrecognized network namespace handle '" << path << "'"; + continue; } // We cleanup the network namespace handle if the associated
