Merge branch 'trunk' into HDFS-6581
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/22295b47 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/22295b47 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/22295b47 Branch: refs/heads/trunk Commit: 22295b4783f2b1789a0df53c7c9915eaaef627dd Parents: 0b10e5a 52945a3 Author: arp <[email protected]> Authored: Thu Sep 18 15:59:37 2014 -0700 Committer: arp <[email protected]> Committed: Thu Sep 18 15:59:37 2014 -0700 ---------------------------------------------------------------------- dev-support/test-patch.sh | 8 +- hadoop-common-project/hadoop-common/CHANGES.txt | 5 + .../hadoop/metrics2/impl/MetricsSystemImpl.java | 35 ++- .../hadoop/hdfs/nfs/nfs3/DFSClientCache.java | 2 +- .../hadoop/hdfs/nfs/nfs3/OpenFileCtx.java | 2 +- .../hadoop/hdfs/nfs/nfs3/RpcProgramNfs3.java | 5 +- .../hdfs/nfs/nfs3/TestRpcProgramNfs3.java | 121 ++++++++++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../java/org/apache/hadoop/hdfs/DFSClient.java | 5 + hadoop-mapreduce-project/CHANGES.txt | 9 + .../apache/hadoop/mapreduce/JobSubmitter.java | 4 +- .../apache/hadoop/mapreduce/MRJobConfig.java | 8 + .../hadoop/mapreduce/security/TokenCache.java | 4 +- .../hadoop/mapreduce/task/reduce/Fetcher.java | 231 ++++++++++++++----- .../task/reduce/ShuffleSchedulerImpl.java | 17 +- .../src/main/resources/mapred-default.xml | 21 ++ .../src/site/markdown/HadoopArchives.md.vm | 5 + .../mapreduce/security/TestTokenCache.java | 19 +- .../mapreduce/task/reduce/TestFetcher.java | 96 +++++++- .../hadoop/mapreduce/v2/hs/client/HSAdmin.java | 6 +- .../v2/hs/server/TestHSAdminServer.java | 5 +- .../mapreduce/security/TestBinaryTokenFile.java | 86 +++++-- hadoop-yarn-project/CHANGES.txt | 8 + .../yarn/client/api/impl/YarnClientImpl.java | 24 +- .../yarn/client/api/impl/TestYarnClient.java | 76 +++--- .../server/resourcemanager/rmapp/RMAppImpl.java | 19 ++ .../resourcemanager/rmnode/RMNodeImpl.java | 47 +++- .../TestResourceTrackerService.java | 11 + .../rmapp/TestRMAppTransitions.java | 6 +- 29 files changed, 730 insertions(+), 158 deletions(-) ----------------------------------------------------------------------
