Repository: hadoop Updated Branches: refs/heads/branch-2.6 ba1e54914 -> 6724c2f7e
HDFS-7296. HdfsConstants#MEMORY_STORAGE_POLICY_ID and HdfsConstants#MEMORY_STORAGE_POLICY_ID are missing in branch-2. Contributed by Jing Zhao. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6724c2f7 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6724c2f7 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6724c2f7 Branch: refs/heads/branch-2.6 Commit: 6724c2f7e4c194f5438d0f51cfbc8672f7cf4227 Parents: ba1e549 Author: Jing Zhao <[email protected]> Authored: Mon Oct 27 11:20:57 2014 -0700 Committer: Jing Zhao <[email protected]> Committed: Mon Oct 27 11:21:48 2014 -0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java | 4 ++-- .../main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java | 4 ++-- .../hdfs/server/blockmanagement/BlockStoragePolicySuite.java | 4 ++-- .../test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/6724c2f7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java index b41e608..60178c7 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSOutputStream.java @@ -454,8 +454,8 @@ public class DFSOutputStream extends FSOutputSummer } private boolean initLazyPersist(HdfsFileStatus stat) { - final BlockStoragePolicy lpPolicy = - blockStoragePolicySuite.getPolicy("LAZY_PERSIST"); + final BlockStoragePolicy lpPolicy = blockStoragePolicySuite + .getPolicy(HdfsConstants.MEMORY_STORAGE_POLICY_NAME); return lpPolicy != null && stat.getStoragePolicy() == lpPolicy.getId(); } http://git-wip-us.apache.org/repos/asf/hadoop/blob/6724c2f7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java index b0d1dca..ecd7a43 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/protocol/HdfsConstants.java @@ -166,14 +166,14 @@ public class HdfsConstants { public static final String SEPARATOR_DOT_SNAPSHOT_DIR_SEPARATOR = Path.SEPARATOR + DOT_SNAPSHOT_DIR + Path.SEPARATOR; + public static final String MEMORY_STORAGE_POLICY_NAME = "LAZY_PERSIST"; public static final String ALLSSD_STORAGE_POLICY_NAME = "ALL_SSD"; public static final String ONESSD_STORAGE_POLICY_NAME = "ONE_SSD"; public static final String HOT_STORAGE_POLICY_NAME = "HOT"; public static final String WARM_STORAGE_POLICY_NAME = "WARM"; public static final String COLD_STORAGE_POLICY_NAME = "COLD"; - public static final String LAZY_PERSIST_STORAGE_POLICY_NAME = "LAZY_PERSIST"; - public static final byte LAZY_PERSIST_STORAGE_POLICY_ID = 15; + public static final byte MEMORY_STORAGE_POLICY_ID = 15; public static final byte ALLSSD_STORAGE_POLICY_ID = 12; public static final byte ONESSD_STORAGE_POLICY_ID = 10; public static final byte HOT_STORAGE_POLICY_ID = 7; http://git-wip-us.apache.org/repos/asf/hadoop/blob/6724c2f7/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java index fa94921..c9b74bd 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockStoragePolicySuite.java @@ -45,9 +45,9 @@ public class BlockStoragePolicySuite { public static BlockStoragePolicySuite createDefaultSuite() { final BlockStoragePolicy[] policies = new BlockStoragePolicy[1 << ID_BIT_LENGTH]; - final byte lazyPersistId = HdfsConstants.LAZY_PERSIST_STORAGE_POLICY_ID; + final byte lazyPersistId = HdfsConstants.MEMORY_STORAGE_POLICY_ID; policies[lazyPersistId] = new BlockStoragePolicy(lazyPersistId, - HdfsConstants.LAZY_PERSIST_STORAGE_POLICY_NAME, + HdfsConstants.MEMORY_STORAGE_POLICY_NAME, new StorageType[]{StorageType.RAM_DISK, StorageType.DISK}, new StorageType[]{StorageType.DISK}, new StorageType[]{StorageType.DISK}, http://git-wip-us.apache.org/repos/asf/hadoop/blob/6724c2f7/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java index cf032a9..d053a79 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestBlockStoragePolicy.java @@ -71,7 +71,7 @@ public class TestBlockStoragePolicy { static final byte HOT = HdfsConstants.HOT_STORAGE_POLICY_ID; static final byte ONESSD = HdfsConstants.ONESSD_STORAGE_POLICY_ID; static final byte ALLSSD = HdfsConstants.ALLSSD_STORAGE_POLICY_ID; - static final byte LAZY_PERSIST = HdfsConstants.LAZY_PERSIST_STORAGE_POLICY_ID; + static final byte LAZY_PERSIST = HdfsConstants.MEMORY_STORAGE_POLICY_ID; @Test (timeout=300000) public void testConfigKeyEnabled() throws IOException {
