Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/hadoop 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/d77c8107 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d77c8107 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d77c8107 Branch: refs/heads/HDFS-7240 Commit: d77c8107fe89f1d56852ed9b1101bc33032ac279 Parents: 14e184a a9019e1 Author: Xiaoyu Yao <[email protected]> Authored: Tue Sep 19 21:56:47 2017 -0700 Committer: Xiaoyu Yao <[email protected]> Committed: Tue Sep 19 21:56:47 2017 -0700 ---------------------------------------------------------------------- BUILDING.txt | 2 + dev-support/bin/create-release | 1 + hadoop-client-modules/hadoop-client/pom.xml | 31 -- .../java/org/apache/hadoop/hdfs/DFSClient.java | 13 +- .../hadoop/hdfs/DFSStripedOutputStream.java | 9 +- .../org/apache/hadoop/hdfs/DataStreamer.java | 31 +- .../hdfs/client/HdfsClientConfigKeys.java | 2 + .../server/blockmanagement/BlockManager.java | 4 +- .../src/main/resources/hdfs-default.xml | 17 ++ .../apache/hadoop/hdfs/StripedFileTestUtil.java | 13 +- .../hadoop/hdfs/TestLeaseRecoveryStriped.java | 156 +++++++--- .../hadoop/hdfs/TestReconstructStripedFile.java | 4 +- .../TestReplaceDatanodeFailureReplication.java | 291 +++++++++++++++++++ .../hadoop/hdfs/TestWriteReadStripedFile.java | 24 +- .../hdfs/TestWriteStripedFileWithFailure.java | 3 +- .../hdfs/server/namenode/TestDeadDatanode.java | 2 +- .../namenode/metrics/TestNameNodeMetrics.java | 18 +- .../hadoop/tools/TestHdfsConfigFields.java | 4 +- .../apache/hadoop/mapred/ShuffleHandler.java | 25 +- .../hadoop-mapreduce-client/pom.xml | 17 +- .../hadoop/examples/BaileyBorweinPlouffe.java | 7 +- .../apache/hadoop/examples/DBCountPageView.java | 7 +- .../hadoop/examples/dancing/DancingLinks.java | 9 +- .../examples/dancing/DistributedPentomino.java | 4 +- .../hadoop/examples/dancing/Pentomino.java | 2 +- .../org/apache/hadoop/examples/pi/DistSum.java | 6 +- .../hadoop/examples/terasort/TeraGen.java | 6 +- .../examples/terasort/TeraOutputFormat.java | 7 +- .../hadoop/examples/terasort/TeraScheduler.java | 7 +- .../hadoop/examples/terasort/TeraSort.java | 6 +- .../hadoop/examples/terasort/TestTeraSort.java | 6 +- hadoop-project-dist/pom.xml | 17 +- hadoop-project/pom.xml | 2 + .../yarn/api/records/ContainerReport.java | 26 ++ .../src/main/proto/yarn_protos.proto | 1 + .../yarn/client/api/impl/TestYarnClient.java | 1 + .../records/impl/pb/ContainerReportPBImpl.java | 20 ++ .../containermanager/TestContainerManager.java | 128 -------- .../TestContainerSchedulerQueuing.java | 70 +++++ .../rmcontainer/RMContainerImpl.java | 2 +- .../scheduler/fair/Schedulable.java | 4 - hadoop-yarn-project/hadoop-yarn/pom.xml | 17 +- 42 files changed, 734 insertions(+), 288 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d77c8107/hadoop-project/pom.xml ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
