You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ae...@apache.org on 2016/04/14 08:18:39 UTC
[21/21] hadoop git commit: Merge branch 'trunk' into HDFS-1312
Merge branch 'trunk' into HDFS-1312
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/648cc93f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/648cc93f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/648cc93f
Branch: refs/heads/HDFS-1312
Commit: 648cc93f6e70f844f1324a7ede83c127158dcd38
Parents: 3a490d6 27b131e
Author: Anu Engineer <ae...@apache.org>
Authored: Wed Apr 13 23:16:15 2016 -0700
Committer: Anu Engineer <ae...@apache.org>
Committed: Wed Apr 13 23:16:15 2016 -0700
----------------------------------------------------------------------
.../apache/hadoop/fs/CachingGetSpaceUsed.java | 168 +++
.../src/main/java/org/apache/hadoop/fs/DU.java | 240 +---
.../java/org/apache/hadoop/fs/GetSpaceUsed.java | 147 +++
.../apache/hadoop/fs/WindowsGetSpaceUsed.java | 46 +
.../org/apache/hadoop/http/HttpServer2.java | 29 +-
.../org/apache/hadoop/metrics2/lib/Interns.java | 16 +-
.../apache/hadoop/util/ShutdownHookManager.java | 2 +-
.../src/site/markdown/DeprecatedProperties.md | 1 +
.../markdown/filesystem/fsdatainputstream.md | 35 +-
.../test/java/org/apache/hadoop/fs/TestDU.java | 46 +-
.../org/apache/hadoop/fs/TestGetSpaceUsed.java | 133 +++
.../org/apache/hadoop/http/TestHttpServer.java | 10 +
.../org/apache/hadoop/hdfs/DFSInputStream.java | 4 +
.../server/blockmanagement/DatanodeManager.java | 115 +-
.../hadoop/hdfs/server/datanode/DNConf.java | 18 +
.../hadoop/hdfs/server/datanode/DataNode.java | 9 +
.../datanode/fsdataset/impl/BlockPoolSlice.java | 93 +-
.../datanode/fsdataset/impl/FsDatasetImpl.java | 20 +-
.../hdfs/server/namenode/FSNamesystem.java | 78 +-
.../hadoop/hdfs/server/namenode/NameNode.java | 24 +-
.../src/main/resources/hdfs-default.xml | 1033 +++++++++++++++++-
.../hdfs/TestDecommissionWithStriped.java | 76 +-
.../TestSortLocatedStripedBlock.java | 557 ++++++++++
.../server/datanode/TestBlockReplacement.java | 3 +-
.../TestDataNodeVolumeFailureToleration.java | 19 +-
.../fsdataset/impl/TestSpaceReservation.java | 60 +
.../namenode/TestNameNodeReconfigure.java | 51 +-
.../hadoop/tools/TestHdfsConfigFields.java | 87 +-
.../org/apache/hadoop/tools/TestJMXGet.java | 3 -
.../yarn/client/api/impl/NMClientImpl.java | 36 +-
.../webapps/static/dt-1.9.4/css/jui-dt.css | 4 +-
.../localizer/LocalizedResource.java | 8 +-
.../nodemanager/webapp/ApplicationPage.java | 18 +-
.../nodemanager/webapp/TestNMAppsPage.java | 86 ++
.../timeline/EntityGroupFSTimelineStore.java | 6 +
35 files changed, 2885 insertions(+), 396 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/648cc93f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/648cc93f/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/FsDatasetImpl.java
----------------------------------------------------------------------