You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by zj...@apache.org on 2015/05/09 02:42:27 UTC
[33/50] hadoop git commit: HDFS-8113. Add check for null
BlockCollection pointers in BlockInfoContiguous structures (Chengbing Liu via
Colin P. McCabe)
HDFS-8113. Add check for null BlockCollection pointers in BlockInfoContiguous structures (Chengbing Liu via Colin P. McCabe)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bb58893e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bb58893e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bb58893e
Branch: refs/heads/YARN-2928
Commit: bb58893e01ae7e0659877b67b0342deb5bb86bef
Parents: 29f6731
Author: Colin Patrick Mccabe <cm...@cloudera.com>
Authored: Fri May 8 13:50:51 2015 -0700
Committer: Zhijie Shen <zj...@apache.org>
Committed: Fri May 8 17:32:51 2015 -0700
----------------------------------------------------------------------
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++
.../hdfs/server/blockmanagement/BlockInfoContiguous.java | 3 ++-
.../hdfs/server/blockmanagement/TestBlockInfo.java | 11 +++++++++++
3 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb58893e/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 1f80a62..b45caec 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -530,6 +530,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8284. Update documentation about how to use HTrace with HDFS (Masatake
Iwasaki via Colin P. McCabe)
+ HDFS-8113. Add check for null BlockCollection pointers in
+ BlockInfoContiguous structures (Chengbing Liu via Colin P. McCabe)
+
OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb58893e/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
index 4314ab3..df27882 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
@@ -74,7 +74,8 @@ public class BlockInfoContiguous extends Block
* @param from BlockInfo to copy from.
*/
protected BlockInfoContiguous(BlockInfoContiguous from) {
- this(from, from.bc.getBlockReplication());
+ super(from);
+ this.triplets = new Object[from.triplets.length];
this.bc = from.bc;
}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/bb58893e/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockInfo.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockInfo.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockInfo.java
index 6cee8b0..c5662ca 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockInfo.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockInfo.java
@@ -69,6 +69,17 @@ public class TestBlockInfo {
Assert.assertEquals(storage, blockInfo.getStorageInfo(0));
}
+ @Test
+ public void testCopyConstructor() {
+ BlockInfoContiguous old = new BlockInfoContiguous((short) 3);
+ try {
+ BlockInfoContiguous copy = new BlockInfoContiguous(old);
+ assertEquals(old.getBlockCollection(), copy.getBlockCollection());
+ assertEquals(old.getCapacity(), copy.getCapacity());
+ } catch (Exception e) {
+ Assert.fail("Copy constructor throws exception: " + e);
+ }
+ }
@Test
public void testReplaceStorage() throws Exception {