Repository: mesos Updated Branches: refs/heads/master 092fb5e3e -> aac4aa96b
Fixed the issue that PortMappingIsolator isolation script can silently fail. Review: https://reviews.apache.org/r/37106 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/aac4aa96 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/aac4aa96 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/aac4aa96 Branch: refs/heads/master Commit: aac4aa96b344d613520355ed612a14b6b0363814 Parents: 092fb5e Author: Paul Brett <[email protected]> Authored: Tue Aug 11 12:50:16 2015 -0700 Committer: Jie Yu <[email protected]> Committed: Tue Aug 11 12:51:01 2015 -0700 ---------------------------------------------------------------------- src/slave/containerizer/isolators/network/port_mapping.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/aac4aa96/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 88c0cbc..6d635d4 100644 --- a/src/slave/containerizer/isolators/network/port_mapping.cpp +++ b/src/slave/containerizer/isolators/network/port_mapping.cpp @@ -3529,7 +3529,7 @@ string PortMappingIsolatorProcess::scripts(Info* info) ostringstream script; script << "#!/bin/sh\n"; - script << "set -x\n"; + script << "set -xe\n"; // Mark the mount point PORT_MAPPING_BIND_MOUNT_ROOT() as slave // mount so that changes in the container will not be propagated to
