Merge remote-tracking branch 'apache-commit/trunk' into HDFS-7240
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/abbf8d9f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/abbf8d9f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/abbf8d9f Branch: refs/heads/HDFS-7240 Commit: abbf8d9f688d472c662a8fc2fc0407c20c53b60e Parents: b0e5a34 419c51d Author: Arpit Agarwal <[email protected]> Authored: Fri Jul 17 13:52:00 2015 -0700 Committer: Arpit Agarwal <[email protected]> Committed: Fri Jul 17 13:52:00 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 11 +++ .../hadoop-common/src/main/bin/hadoop | 52 +++++------ .../src/main/bin/hadoop-functions.sh | 90 ++++++++++++++++++++ .../apache/hadoop/fs/RawLocalFileSystem.java | 53 ++++++------ .../apache/hadoop/util/hash/JenkinsHash.java | 15 ++-- ...yptoStreamsWithOpensslAesCtrCryptoCodec.java | 5 +- .../apache/hadoop/fs/TestLocalFileSystem.java | 22 +++++ .../hadoop/io/TestSequenceFileAppend.java | 5 ++ .../apache/hadoop/test/GenericTestUtils.java | 9 ++ hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 + .../hadoop-hdfs/src/main/bin/hdfs | 82 ++++++++---------- .../java/org/apache/hadoop/hdfs/DFSClient.java | 16 +--- .../hadoop/hdfs/client/impl/LeaseRenewer.java | 12 ++- .../hadoop/hdfs/TestDFSClientRetries.java | 66 +++++++++++++- hadoop-mapreduce-project/bin/mapred | 33 +++---- hadoop-project/src/site/site.xml | 2 +- hadoop-yarn-project/CHANGES.txt | 21 +++++ hadoop-yarn-project/hadoop-yarn/bin/yarn | 54 +++++------- .../nodelabels/FileSystemNodeLabelsStore.java | 39 +++++---- .../hadoop/yarn/server/webapp/AppBlock.java | 6 +- .../container-executor/impl/configuration.c | 9 +- .../impl/container-executor.c | 20 +++-- .../impl/container-executor.h | 4 +- .../test/test-container-executor.c | 32 +++---- .../ProportionalCapacityPreemptionPolicy.java | 8 +- .../rmcontainer/RMContainerImpl.java | 14 ++- .../scheduler/capacity/CapacityScheduler.java | 10 ++- .../event/ContainerRescheduledEvent.java | 35 ++++++++ .../scheduler/event/SchedulerEventType.java | 3 + .../scheduler/fair/FairScheduler.java | 11 ++- .../scheduler/fifo/FifoScheduler.java | 9 ++ .../applicationsmanager/TestAMRestart.java | 2 +- ...estProportionalCapacityPreemptionPolicy.java | 32 +++++++ .../scheduler/TestAbstractYarnScheduler.java | 90 ++++++++++++++++++++ .../scheduler/fair/TestFairScheduler.java | 4 + .../src/site/markdown/NodeManager.md | 49 +++++++++-- .../src/site/markdown/NodeManagerRestart.md | 53 ------------ 37 files changed, 688 insertions(+), 293 deletions(-) ----------------------------------------------------------------------
