HDFS-8867. Enable optimized block reports. Contributed by Daryn Sharp.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/f61120d9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/f61120d9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/f61120d9 Branch: refs/heads/HDFS-7240 Commit: f61120d964a609ae5eabeb5c4d6c9afe0a15cad8 Parents: 9c3571e Author: Jing Zhao <ji...@apache.org> Authored: Wed Aug 19 10:36:56 2015 -0700 Committer: Jing Zhao <ji...@apache.org> Committed: Wed Aug 19 10:36:56 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 2 ++ .../hadoop/hdfs/server/protocol/NamespaceInfo.java | 17 +++++++++++++---- .../hadoop/hdfs/protocol/TestBlockListAsLongs.java | 9 ++++++++- 3 files changed, 23 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/f61120d9/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 7e6370a..c463f12 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -1205,6 +1205,8 @@ Release 2.7.2 - UNRELEASED HDFS-8852. HDFS architecture documentation of version 2.x is outdated about append write support. (Ajith S via aajisaka) + HDFS-8867. Enable optimized block reports. (Daryn Sharp via jing9) + Release 2.7.1 - 2015-07-06 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/f61120d9/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java index dfdf449..90d0aac 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/protocol/NamespaceInfo.java @@ -47,18 +47,27 @@ public class NamespaceInfo extends StorageInfo { // only authoritative on the server-side to determine advertisement to // clients. enum will update the supported values - private static long CAPABILITIES_SUPPORTED = 0; + private static final long CAPABILITIES_SUPPORTED = getSupportedCapabilities(); + + private static long getSupportedCapabilities() { + long mask = 0; + for (Capability c : Capability.values()) { + if (c.supported) { + mask |= c.mask; + } + } + return mask; + } public enum Capability { UNKNOWN(false), STORAGE_BLOCK_REPORT_BUFFERS(true); // use optimized ByteString buffers + private final boolean supported; private final long mask; Capability(boolean isSupported) { + supported = isSupported; int bits = ordinal() - 1; mask = (bits < 0) ? 0 : (1L << bits); - if (isSupported) { - CAPABILITIES_SUPPORTED |= mask; - } } public long getMask() { return mask; http://git-wip-us.apache.org/repos/asf/hadoop/blob/f61120d9/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java index 9ead765..bf29373 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/protocol/TestBlockListAsLongs.java @@ -187,7 +187,14 @@ public class TestBlockListAsLongs { } assertTrue(reportReplicas.isEmpty()); } - + + @Test + public void testCapabilitiesInited() { + NamespaceInfo nsInfo = new NamespaceInfo(); + assertTrue( + nsInfo.isCapabilitySupported(Capability.STORAGE_BLOCK_REPORT_BUFFERS)); + } + @Test public void testDatanodeDetect() throws ServiceException, IOException { final AtomicReference<BlockReportRequestProto> request =
