Repository: hbase Updated Branches: refs/heads/master 1fd2a276f -> d68f697f3
HBASE-20052 TestRegionOpen#testNonExistentRegionReplica fails due to NPE Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d68f697f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d68f697f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d68f697f Branch: refs/heads/master Commit: d68f697f39fc0e660eb85dc9ef67a757102169f2 Parents: 1fd2a27 Author: tedyu <yuzhih...@gmail.com> Authored: Thu Feb 22 12:35:12 2018 -0800 Committer: tedyu <yuzhih...@gmail.com> Committed: Thu Feb 22 12:35:12 2018 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java | 3 +-- .../java/org/apache/hadoop/hbase/regionserver/TestRegionOpen.java | 2 -- 2 files changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/d68f697f/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java index 3c2d392..904060f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionFileSystem.java @@ -986,12 +986,11 @@ public class HRegionFileSystem { // Write HRI to a file in case we need to recover hbase:meta regionFs.writeRegionInfoOnFilesystem(false); - return regionFs; } else { if (LOG.isDebugEnabled()) LOG.debug("Skipping creation of .regioninfo file for " + regionInfo); } - return null; + return regionFs; } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/d68f697f/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionOpen.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionOpen.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionOpen.java index 48ca403..7190d84 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionOpen.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestRegionOpen.java @@ -45,7 +45,6 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; @@ -101,7 +100,6 @@ public class TestRegionOpen { assertEquals(completed + 1, exec.getCompletedTaskCount()); } - @Ignore // Needs rewrite since HBASE-19391 which returns null out of createRegionOnFileSystem @Test public void testNonExistentRegionReplica() throws Exception { final TableName tableName = TableName.valueOf(name.getMethodName());
