Merge branch 'trunk' into HADOOP-12111
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0b6953a9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0b6953a9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0b6953a9 Branch: refs/heads/HADOOP-12111 Commit: 0b6953a9405a1fff7360da8a22174987c2ad9936 Parents: 4d4f288 f170934 Author: Allen Wittenauer <a...@apache.org> Authored: Tue Jul 28 10:42:31 2015 -0700 Committer: Allen Wittenauer <a...@apache.org> Committed: Tue Jul 28 10:42:31 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 + .../apache/hadoop/io/retry/MultiException.java | 49 +++ .../hadoop/io/retry/RetryInvocationHandler.java | 99 ++++- .../src/site/markdown/FileSystemShell.md | 2 +- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 + .../ha/ConfiguredFailoverProxyProvider.java | 52 ++- .../ha/RequestHedgingProxyProvider.java | 186 +++++++++ .../markdown/HDFSHighAvailabilityWithNFS.md | 9 +- .../markdown/HDFSHighAvailabilityWithQJM.md | 10 +- .../ha/TestRequestHedgingProxyProvider.java | 350 ++++++++++++++++ hadoop-yarn-project/CHANGES.txt | 13 + .../server/nodemanager/ContainerExecutor.java | 23 +- .../nodemanager/DefaultContainerExecutor.java | 2 +- .../nodemanager/DockerContainerExecutor.java | 2 +- .../nodemanager/LinuxContainerExecutor.java | 222 +++++----- .../launcher/ContainerLaunch.java | 15 + .../linux/privileged/PrivilegedOperation.java | 46 +- .../PrivilegedOperationException.java | 30 +- .../privileged/PrivilegedOperationExecutor.java | 30 +- .../linux/resources/CGroupsHandler.java | 8 + .../linux/resources/CGroupsHandlerImpl.java | 12 +- .../runtime/DefaultLinuxContainerRuntime.java | 148 +++++++ .../DelegatingLinuxContainerRuntime.java | 110 +++++ .../runtime/DockerLinuxContainerRuntime.java | 273 ++++++++++++ .../linux/runtime/LinuxContainerRuntime.java | 38 ++ .../runtime/LinuxContainerRuntimeConstants.java | 69 +++ .../linux/runtime/docker/DockerClient.java | 82 ++++ .../linux/runtime/docker/DockerCommand.java | 66 +++ .../linux/runtime/docker/DockerLoadCommand.java | 30 ++ .../linux/runtime/docker/DockerRunCommand.java | 107 +++++ .../runtime/ContainerExecutionException.java | 85 ++++ .../runtime/ContainerRuntime.java | 50 +++ .../runtime/ContainerRuntimeConstants.java | 33 ++ .../runtime/ContainerRuntimeContext.java | 105 +++++ .../executor/ContainerLivenessContext.java | 13 + .../executor/ContainerReacquisitionContext.java | 13 + .../executor/ContainerSignalContext.java | 13 + .../executor/ContainerStartContext.java | 23 +- .../container-executor/impl/configuration.c | 21 +- .../container-executor/impl/configuration.h | 2 + .../impl/container-executor.c | 417 ++++++++++++++++--- .../impl/container-executor.h | 25 +- .../main/native/container-executor/impl/main.c | 97 ++++- .../test/test-container-executor.c | 22 +- .../TestLinuxContainerExecutorWithMocks.java | 118 ++++-- .../TestPrivilegedOperationExecutor.java | 8 +- .../runtime/TestDockerContainerRuntime.java | 219 ++++++++++ .../webapp/CapacitySchedulerPage.java | 5 +- 48 files changed, 3050 insertions(+), 307 deletions(-) ----------------------------------------------------------------------