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/3d80b512 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3d80b512 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3d80b512 Branch: refs/heads/HADOOP-12111 Commit: 3d80b51245a18e05b6b48e65c96428e1ab97def8 Parents: 03335bb ddc867ce Author: Allen Wittenauer <[email protected]> Authored: Wed Jul 29 18:26:43 2015 -0700 Committer: Allen Wittenauer <[email protected]> Committed: Wed Jul 29 18:26:43 2015 -0700 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 6 + .../main/java/org/apache/hadoop/fs/FsShell.java | 11 +- .../hadoop/fs/permission/UmaskParser.java | 2 +- .../src/main/resources/core-default.xml | 12 ++ .../hadoop-common/src/site/markdown/Metrics.md | 1 - .../fs/FileContextMainOperationsBaseTest.java | 4 +- .../java/org/apache/hadoop/fs/TestFsShell.java | 24 +++ .../apache/hadoop/tracing/SetSpanReceiver.java | 2 +- .../hadoop/hdfs/protocol/HdfsConstants.java | 3 + hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 16 +- hadoop-hdfs-project/hadoop-hdfs/pom.xml | 1 + .../java/org/apache/hadoop/fs/SWebHdfs.java | 51 ++++++ .../main/java/org/apache/hadoop/fs/WebHdfs.java | 51 ++++++ .../main/java/org/apache/hadoop/fs/package.html | 26 +++ .../server/blockmanagement/BlockManager.java | 4 - .../BlockStoragePolicySuite.java | 6 +- .../blockmanagement/UnderReplicatedBlocks.java | 33 +--- .../hdfs/server/common/HdfsServerConstants.java | 3 - .../hdfs/server/namenode/FSNamesystem.java | 15 +- .../src/main/webapps/hdfs/dfshealth.html | 44 +++--- .../src/main/webapps/hdfs/dfshealth.js | 46 +++++- .../src/main/webapps/static/hadoop.css | 51 ++++++ .../src/main/webapps/static/moment.min.js | 7 + .../TestSWebHdfsFileContextMainOperations.java | 110 +++++++++++++ .../TestWebHdfsFileContextMainOperations.java | 157 +++++++++++++++++++ .../org/apache/hadoop/hdfs/DFSTestUtil.java | 2 +- .../hadoop/hdfs/TestBlockStoragePolicy.java | 118 ++++++++++---- .../apache/hadoop/hdfs/TestDecommission.java | 98 ++++++++++++ .../org/apache/hadoop/hdfs/TestReplication.java | 26 ++- .../TestUnderReplicatedBlocks.java | 48 ------ .../hdfs/server/mover/TestStorageMover.java | 8 +- .../apache/hadoop/security/TestPermission.java | 26 +++ hadoop-yarn-project/CHANGES.txt | 9 ++ .../distributedshell/ApplicationMaster.java | 31 +++- .../distributedshell/TestDSAppMaster.java | 11 +- .../hadoop/yarn/event/AsyncDispatcher.java | 3 +- .../nodelabels/FileSystemNodeLabelsStore.java | 8 +- .../hadoop/yarn/util/resource/Resources.java | 14 +- .../scheduler/fair/FSAppAttempt.java | 4 +- 39 files changed, 907 insertions(+), 185 deletions(-) ----------------------------------------------------------------------
