Repository: hadoop Updated Branches: refs/heads/trunk fad4cd85b -> 98f7bfe99
Merging r1617377 through r1617565 from trunk. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/HDFS-6584@1617566 13f79535-47bb-0310-9956-ffa450edef68 Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/de3804f7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/de3804f7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/de3804f7 Branch: refs/heads/trunk Commit: de3804f756c4cb6d97dc008f41b7bac48a41026c Parents: 04884cd 0c9b8f2 Author: Jing Zhao <[email protected]> Authored: Tue Aug 12 19:25:57 2014 +0000 Committer: Jing Zhao <[email protected]> Committed: Tue Aug 12 19:25:57 2014 +0000 ---------------------------------------------------------------------- .../server/AuthenticationFilter.java | 25 ++- hadoop-common-project/hadoop-common/CHANGES.txt | 9 +- .../web/DelegationTokenAuthenticatedURL.java | 13 ++ .../DelegationTokenAuthenticationFilter.java | 178 +++++++++++++++++- .../DelegationTokenAuthenticationHandler.java | 4 + .../web/HttpUserGroupInformation.java | 43 +++++ .../hadoop/util/GenericOptionsParser.java | 6 + .../delegation/web/TestWebDelegationToken.java | 174 +++++++++++++++-- .../hadoop/util/TestGenericOptionsParser.java | 66 +++++++ hadoop-yarn-project/CHANGES.txt | 6 + .../hadoop/yarn/webapp/util/WebAppUtils.java | 51 ++++- .../yarn/webapp/util/TestWebAppUtils.java | 148 +++++++++++++++ .../server/nodemanager/ContainerExecutor.java | 73 +++++++- .../nodemanager/DefaultContainerExecutor.java | 59 +++++- .../nodemanager/LinuxContainerExecutor.java | 7 + .../server/nodemanager/NodeStatusUpdater.java | 23 +++ .../nodemanager/NodeStatusUpdaterImpl.java | 34 ++-- .../containermanager/ContainerManagerImpl.java | 167 +++++++++++++---- .../container/ContainerImpl.java | 165 ++++++++++++----- .../launcher/ContainerLaunch.java | 46 +++-- .../launcher/ContainersLauncher.java | 15 +- .../launcher/ContainersLauncherEventType.java | 1 + .../launcher/RecoveredContainerLaunch.java | 126 +++++++++++++ .../logaggregation/AppLogAggregator.java | 2 + .../logaggregation/AppLogAggregatorImpl.java | 14 +- .../logaggregation/LogAggregationService.java | 10 +- .../recovery/NMLeveldbStateStoreService.java | 167 +++++++++++++++++ .../recovery/NMNullStateStoreService.java | 38 ++++ .../recovery/NMStateStoreService.java | 185 +++++++++++++++++++ .../impl/container-executor.c | 99 ++++++++++ .../nodemanager/TestNodeStatusUpdater.java | 13 +- .../BaseContainerManagerTest.java | 2 +- .../containermanager/TestAuxServices.java | 3 +- .../TestContainerManagerRecovery.java | 1 + .../container/TestContainer.java | 3 +- .../recovery/NMMemoryStateStoreService.java | 76 ++++++++ .../TestNMLeveldbStateStoreService.java | 124 +++++++++++++ .../nodemanager/webapp/TestNMWebServer.java | 2 +- .../resourcemanager/rmnode/RMNodeImpl.java | 38 +--- .../scheduler/SchedulerUtils.java | 7 +- .../scheduler/capacity/CapacityScheduler.java | 5 +- .../TestResourceTrackerService.java | 2 +- 42 files changed, 2034 insertions(+), 196 deletions(-) ----------------------------------------------------------------------
