Merge branch 'trunk' into MR-2841
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b160707a Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b160707a Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b160707a Branch: refs/heads/trunk Commit: b160707ace7900f360fa914cd291675c1d9703ec Parents: 52a8b4d d1fa582 Author: Sean Zhong <clock...@gmail.com> Authored: Sun Sep 7 13:01:27 2014 +0800 Committer: Sean Zhong <clock...@gmail.com> Committed: Sun Sep 7 13:01:27 2014 +0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 13 + .../src/main/bin/hadoop-functions.sh | 4 +- .../crypto/key/kms/KMSClientProvider.java | 6 +- .../security/ssl/FileBasedKeyStoresFactory.java | 2 +- hadoop-common-project/hadoop-kms/pom.xml | 4 +- .../hadoop/crypto/key/kms/server/MiniKMS.java | 197 +++++++++++++ .../hadoop/crypto/key/kms/server/TestKMS.java | 88 +----- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 16 ++ hadoop-hdfs-project/hadoop-hdfs/pom.xml | 6 +- .../hadoop-hdfs/src/main/bin/hdfs | 15 +- .../java/org/apache/hadoop/hdfs/DFSClient.java | 4 + .../hadoop/hdfs/DistributedFileSystem.java | 24 ++ .../hadoop/hdfs/protocol/HdfsConstants.java | 2 +- .../server/blockmanagement/BlockManager.java | 23 +- .../server/blockmanagement/DatanodeManager.java | 6 +- .../server/blockmanagement/HostFileManager.java | 4 + .../server/datanode/ReplicaBeingWritten.java | 12 +- .../hdfs/server/datanode/ReplicaInPipeline.java | 33 ++- .../hdfs/server/datanode/ReplicaInfo.java | 7 + .../server/datanode/fsdataset/FsVolumeSpi.java | 11 + .../datanode/fsdataset/impl/BlockPoolSlice.java | 6 +- .../datanode/fsdataset/impl/FsDatasetImpl.java | 15 +- .../datanode/fsdataset/impl/FsVolumeImpl.java | 58 +++- .../hdfs/server/namenode/FSNamesystem.java | 46 +-- .../org/apache/hadoop/hdfs/tools/DFSAdmin.java | 175 +++++------ .../apache/hadoop/hdfs/TestEncryptionZones.java | 43 +++ .../apache/hadoop/hdfs/TestHDFSServerPorts.java | 24 +- .../server/datanode/TestDirectoryScanner.java | 8 + .../fsdataset/impl/TestRbwSpaceReservation.java | 288 +++++++++++++++++++ .../fsdataset/impl/TestWriteToReplica.java | 2 +- .../hdfs/server/namenode/NameNodeAdapter.java | 2 +- .../TestValidateConfigurationSettings.java | 16 +- .../namenode/ha/TestDelegationTokensWithHA.java | 63 ++-- .../hdfs/server/namenode/ha/TestHAMetrics.java | 10 +- .../namenode/ha/TestHAStateTransitions.java | 52 ++-- .../namenode/ha/TestStandbyCheckpoints.java | 54 ++-- .../java/org/apache/hadoop/tools/TestTools.java | 2 +- hadoop-yarn-project/CHANGES.txt | 6 + .../yarn/webapp/util/TestWebAppUtils.java | 4 +- .../webapp/CrossOriginFilterInitializer.java | 12 +- .../TestCrossOriginFilterInitializer.java | 7 +- pom.xml | 1 + 42 files changed, 998 insertions(+), 373 deletions(-) ----------------------------------------------------------------------
