You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2018/02/24 01:55:26 UTC
[3/5] hbase git commit: HBASE-20052
TestRegionOpen#testNonExistentRegionReplica fails due to NPE
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/1b0b8d95
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1b0b8d95
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1b0b8d95
Branch: refs/heads/branch-1.4
Commit: 1b0b8d95364fe9b2fb03b0a74b4c6bfba8af02d2
Parents: 29b03a5
Author: tedyu <yu...@gmail.com>
Authored: Thu Feb 22 12:41:13 2018 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Feb 23 17:03:03 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/1b0b8d95/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 1a66063..bc3b039 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
@@ -967,12 +967,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/1b0b8d95/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 62aabce..f45df18 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
@@ -47,7 +47,6 @@ import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.FSUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
-import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
@@ -98,7 +97,6 @@ public class TestRegionOpen {
assertEquals(2, 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());