Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HDFS-8113. Add check for null BlockCollection pointers in BlockInfoContiguous structures (Chengbing Liu via Colin P. McCabe) 

(cherry picked from commit f523e963e4)
This commit is contained in:
Colin Patrick Mccabe 2015-05-08 13:50:51 -07:00
parent fbb2cf54bc
commit ab80a572be
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -200,6 +200,9 @@ Release 2.8.0 - UNRELEASED
HDFS-8284. Update documentation about how to use HTrace with HDFS (Masatake HDFS-8284. Update documentation about how to use HTrace with HDFS (Masatake
Iwasaki via Colin P. McCabe) Iwasaki via Colin P. McCabe)
HDFS-8113. Add check for null BlockCollection pointers in
BlockInfoContiguous structures (Chengbing Liu via Colin P. McCabe)
OPTIMIZATIONS OPTIMIZATIONS
HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than HDFS-8026. Trace FSOutputSummer#writeChecksumChunks rather than

3
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockInfoContiguous.java
View File

@ -77,7 +77,8 @@ public BlockInfoContiguous(Block blk, short replication) {
* @param from BlockInfo to copy from. * @param from BlockInfo to copy from.
*/ */
protected BlockInfoContiguous(BlockInfoContiguous from) { protected BlockInfoContiguous(BlockInfoContiguous from) {
this(from, from.bc.getBlockReplication()); super(from);
this.triplets = new Object[from.triplets.length];
this.bc = from.bc; this.bc = from.bc;
} }

11
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestBlockInfo.java
View File

@ -69,6 +69,17 @@ public void testAddStorage() throws Exception {
Assert.assertEquals(storage, blockInfo.getStorageInfo(0)); 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 @Test
public void testReplaceStorage() throws Exception { public void testReplaceStorage() throws Exception {