Merge branch 'trunk' into HADOOP-12756
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/846c5ceb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/846c5ceb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/846c5ceb Branch: refs/heads/trunk Commit: 846c5ceb3a929ad7b2dcea9bef07299af17bdc84 Parents: a49b3be 964e546 Author: Kai Zheng <[email protected]> Authored: Fri Sep 23 08:42:28 2016 +0800 Committer: Kai Zheng <[email protected]> Committed: Fri Sep 23 08:42:28 2016 +0800 ---------------------------------------------------------------------- .../apache/hadoop/io/ElasticByteBufferPool.java | 2 +- .../apache/hadoop/io/erasurecode/ECChunk.java | 22 + .../io/erasurecode/rawcoder/CoderUtil.java | 3 + .../AbstractDelegationTokenSecretManager.java | 2 +- .../org/apache/hadoop/hdfs/DFSInputStream.java | 20 +- .../hadoop/hdfs/DFSStripedInputStream.java | 654 +------ .../hadoop/hdfs/PositionStripeReader.java | 104 + .../hadoop/hdfs/StatefulStripeReader.java | 95 + .../org/apache/hadoop/hdfs/StripeReader.java | 463 +++++ .../hadoop/hdfs/util/StripedBlockUtil.java | 158 +- .../apache/hadoop/hdfs/TestEncryptionZones.java | 23 +- .../blockmanagement/TestBlockTokenWithDFS.java | 8 +- .../TestBlockTokenWithDFSStriped.java | 23 +- .../hdfs/tools/TestDFSZKFailoverController.java | 18 +- .../hadoop/hdfs/util/TestStripedBlockUtil.java | 1 - .../dev-support/findbugs-exclude.xml | 10 + .../apache/hadoop/yarn/webapp/Dispatcher.java | 9 + .../org/apache/hadoop/yarn/webapp/WebApp.java | 4 +- .../hadoop/yarn/webapp/view/RobotsTextPage.java | 39 + .../apache/hadoop/yarn/webapp/TestWebApp.java | 26 + .../reservation/NoOverCommitPolicy.java | 12 - .../exceptions/MismatchedUserException.java | 46 - .../scheduler/capacity/AbstractCSQueue.java | 378 ++-- .../scheduler/capacity/LeafQueue.java | 1819 ++++++++++-------- .../scheduler/capacity/ParentQueue.java | 825 ++++---- .../scheduler/capacity/PlanQueue.java | 122 +- .../scheduler/capacity/ReservationQueue.java | 67 +- .../scheduler/common/fica/FiCaSchedulerApp.java | 2 +- .../ReservationACLsTestBase.java | 2 + .../reservation/TestNoOverCommitPolicy.java | 21 - .../capacity/TestContainerResizing.java | 4 +- .../server/TestContainerManagerSecurity.java | 5 + 32 files changed, 2781 insertions(+), 2206 deletions(-) ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
