Repository: mesos Updated Branches: refs/heads/master da7b4ac6c -> 5d3093a39
Do not return error if removing bind mount fails. Review: https://reviews.apache.org/r/28339 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5d3093a3 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5d3093a3 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5d3093a3 Branch: refs/heads/master Commit: 5d3093a39970a5cd0b907de13d96c8dc046ce3e3 Parents: da7b4ac Author: Jie Yu <[email protected]> Authored: Fri Nov 21 10:35:23 2014 -0800 Committer: Jie Yu <[email protected]> Committed: Fri Nov 21 10:46:10 2014 -0800 ---------------------------------------------------------------------- src/slave/containerizer/isolators/network/port_mapping.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5d3093a3/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 3755413..c6fff21 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -2328,11 +2328,11 @@ Try<Nothing> PortMappingIsolatorProcess::_cleanup(Info* _info) // someone entered into the container for debugging purpose. In that // case remove will fail, which is okay, because we only leaked an // empty file, which could also be reused later if the pid (the name - // of the file) is used again. However, we still return error to - // indicate that the cleanup hasn't been successful. + // of the file) is used again. Try<Nothing> rm = os::rm(target); if (rm.isError()) { - errors.push_back("Failed to remove " + target + ": " + rm.error()); + LOG(WARNING) << "Failed to remove bind mount '" << target + << "' during cleanup: " << rm.error(); } // We manually remove veth to avoid having to wait for the kernel to
