Merge branch 'trunk' into HDFS-6584
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f1432e24
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f1432e24
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f1432e24
Branch: refs/heads/HDFS-6581
Commit: f1432e24244034f2009fc91e4bae390c6fcc78b0
Parents: 22a41dc 0974f43
Author: Tsz-Wo Nicholas Sze <szets...@hortonworks.com>
Authored: Mon Sep 8 10:54:48 2014 +0800
Committer: Tsz-Wo Nicholas Sze <szets...@hortonworks.com>
Committed: Mon Sep 8 10:54:48 2014 +0800
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 8 +
.../crypto/key/kms/KMSClientProvider.java | 6 +-
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 | 12 +-
.../java/org/apache/hadoop/hdfs/DFSClient.java | 4 +
.../hadoop/hdfs/DistributedFileSystem.java | 24 ++
.../hadoop/hdfs/protocol/HdfsConstants.java | 2 +-
.../server/blockmanagement/BlockManager.java | 21 +-
.../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 +--
.../apache/hadoop/cli/TestCryptoAdminCLI.java | 4 +-
.../org/apache/hadoop/hdfs/TestDFSUtil.java | 4 +-
.../apache/hadoop/hdfs/TestEncryptionZones.java | 55 +++-
.../hadoop/hdfs/TestReservedRawPaths.java | 3 +-
.../server/datanode/TestDirectoryScanner.java | 8 +
.../fsdataset/impl/TestRbwSpaceReservation.java | 288 +++++++++++++++++++
.../fsdataset/impl/TestWriteToReplica.java | 2 +-
.../hdfs/server/namenode/NameNodeAdapter.java | 2 +-
hadoop-yarn-project/CHANGES.txt | 15 +
.../hadoop/yarn/api/records/ContainerId.java | 39 ++-
.../apache/hadoop/yarn/util/ConverterUtils.java | 15 +-
.../apache/hadoop/yarn/api/TestContainerId.java | 4 +
.../hadoop/yarn/util/TestConverterUtils.java | 9 +
.../yarn/webapp/util/TestWebAppUtils.java | 4 +-
.../timeline/webapp/CrossOriginFilter.java | 20 +-
.../webapp/CrossOriginFilterInitializer.java | 12 +-
.../timeline/webapp/TestCrossOriginFilter.java | 21 +-
.../TestCrossOriginFilterInitializer.java | 7 +-
.../src/site/apt/TimelineServer.apt.vm | 37 +++
39 files changed, 952 insertions(+), 161 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1432e24/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1432e24/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1432e24/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DistributedFileSystem.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1432e24/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1432e24/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
----------------------------------------------------------------------
diff --cc
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
index 956900d,6176188..9b030e7
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
@@@ -398,10 -396,22 +399,26 @@@ public class BlockManager
}
}
+ public BlockStoragePolicy getStoragePolicy(final String policyName) {
+ return storagePolicySuite.getPolicy(policyName);
+ }
+
+ public long getReplicationRecheckInterval() {
+ return replicationRecheckInterval;
+ }
+
+ public AtomicLong excessBlocksCount() {
+ return excessBlocksCount;
+ }
+
+ public void clearInvalidateBlocks() {
+ invalidateBlocks.clear();
+ }
+
+ void setReplicationMonitor(Runnable replicationMonitor) {
+ replicationThread = new Daemon(replicationMonitor);
+ }
+
public void setBlockPoolId(String blockPoolId) {
if (isBlockTokenEnabled()) {
blockTokenSecretManager.setBlockPoolId(blockPoolId);
http://git-wip-us.apache.org/repos/asf/hadoop/blob/f1432e24/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSNamesystem.java
----------------------------------------------------------------------
