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/0a607a24 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0a607a24 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0a607a24 Branch: refs/heads/HADOOP-12111 Commit: 0a607a24ca2df674914ae509d97d2d900292494a Parents: b4c7aa1 2eae130 Author: Allen Wittenauer <[email protected]> Authored: Fri Jul 3 07:15:29 2015 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Fri Jul 3 07:15:29 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 24 ++ .../java/org/apache/hadoop/fs/FileUtil.java | 42 +++ .../main/java/org/apache/hadoop/fs/FsShell.java | 16 +- .../main/java/org/apache/hadoop/fs/Globber.java | 11 +- .../java/org/apache/hadoop/fs/shell/Mkdir.java | 3 +- .../org/apache/hadoop/ipc/RpcClientUtil.java | 24 ++ .../main/java/org/apache/hadoop/ipc/Server.java | 4 +- .../org/apache/hadoop/net/NetworkTopology.java | 3 +- .../main/java/org/apache/hadoop/util/Shell.java | 6 +- ...yptoStreamsWithOpensslAesCtrCryptoCodec.java | 9 +- .../java/org/apache/hadoop/fs/TestFileUtil.java | 112 +++++- .../apache/hadoop/fs/TestFsShellReturnCode.java | 60 +++- .../org/apache/hadoop/fs/shell/TestMove.java | 1 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 16 + .../hadoop-hdfs/src/CMakeLists.txt | 129 +++---- .../src/contrib/libwebhdfs/CMakeLists.txt | 8 +- .../libwebhdfs/resources/FindJansson.cmake | 9 +- .../java/org/apache/hadoop/hdfs/DFSClient.java | 2 +- .../org/apache/hadoop/hdfs/DFSInputStream.java | 233 +++++++++---- .../hadoop/hdfs/server/namenode/FSEditLog.java | 28 +- .../apache/hadoop/hdfs/tools/DebugAdmin.java | 10 +- .../src/main/native/fuse-dfs/CMakeLists.txt | 91 ++--- .../src/site/markdown/HDFSCommands.md | 2 +- .../org/apache/hadoop/fs/TestGlobPaths.java | 25 ++ .../hadoop/hdfs/TestDFSClientRetries.java | 2 +- .../hadoop/hdfs/server/mover/TestMover.java | 19 ++ .../hadoop/hdfs/tools/TestDebugAdmin.java | 8 + .../org/apache/hadoop/tracing/TestTracing.java | 18 +- hadoop-mapreduce-project/CHANGES.txt | 18 + .../hadoop/mapred/LocalContainerLauncher.java | 2 +- .../jobhistory/JobHistoryEventHandler.java | 19 +- .../hadoop/mapreduce/v2/app/MRAppMaster.java | 14 +- .../event/JobTaskAttemptFetchFailureEvent.java | 9 +- .../TaskAttemptTooManyFetchFailureEvent.java | 50 +++ .../mapreduce/v2/app/job/impl/JobImpl.java | 7 +- .../v2/app/job/impl/TaskAttemptImpl.java | 15 +- .../hadoop/mapreduce/jobhistory/TestEvents.java | 3 +- .../apache/hadoop/mapreduce/v2/app/MRApp.java | 15 + .../mapreduce/v2/app/TestFetchFailure.java | 31 +- .../v2/app/job/impl/TestTaskAttempt.java | 143 ++++---- .../mapreduce/v2/jobhistory/JHAdminConfig.java | 7 + .../hadoop/mapreduce/JobResourceUploader.java | 38 +-- .../mapreduce/jobhistory/EventReader.java | 12 +- .../mapreduce/jobhistory/EventWriter.java | 29 +- .../src/main/resources/mapred-default.xml | 9 + .../src/CMakeLists.txt | 337 ++++++++----------- .../src/JNIFlags.cmake | 118 ------- .../java/org/apache/hadoop/tools/DistCp.java | 3 +- .../apache/hadoop/tools/util/DistCpUtils.java | 39 --- hadoop-yarn-project/CHANGES.txt | 21 ++ .../java/org/apache/hadoop/yarn/util/Apps.java | 19 +- .../src/main/resources/yarn-default.xml | 2 +- .../org/apache/hadoop/yarn/util/TestApps.java | 61 ++++ .../src/CMakeLists.txt | 23 +- .../logaggregation/AppLogAggregatorImpl.java | 6 +- .../TestLogAggregationService.java | 36 ++ .../server/resourcemanager/ResourceManager.java | 34 -- .../monitor/SchedulingEditPolicy.java | 6 +- .../monitor/SchedulingMonitor.java | 3 +- .../ProportionalCapacityPreemptionPolicy.java | 42 +-- .../scheduler/AbstractYarnScheduler.java | 34 +- .../scheduler/ContainerPreemptEvent.java | 8 +- .../scheduler/ContainerPreemptEventType.java | 26 -- .../scheduler/capacity/CapacityScheduler.java | 24 ++ .../scheduler/event/SchedulerEventType.java | 7 +- .../scheduler/fair/FSSchedulerNode.java | 11 +- .../resourcemanager/TestRMDispatcher.java | 79 +++++ ...estProportionalCapacityPreemptionPolicy.java | 19 +- ...pacityPreemptionPolicyForNodePartitions.java | 12 +- .../scheduler/TestAbstractYarnScheduler.java | 74 +++- 70 files changed, 1463 insertions(+), 917 deletions(-) ----------------------------------------------------------------------
