HBASE-20052 TestRegionOpen#testNonExistentRegionReplica fails due to NPE
This commit is contained in:
parent
1fd2a276f6
commit
d68f697f39
|
@ -986,12 +986,11 @@ public class HRegionFileSystem {
|
||||||
|
|
||||||
// Write HRI to a file in case we need to recover hbase:meta
|
// Write HRI to a file in case we need to recover hbase:meta
|
||||||
regionFs.writeRegionInfoOnFilesystem(false);
|
regionFs.writeRegionInfoOnFilesystem(false);
|
||||||
return regionFs;
|
|
||||||
} else {
|
} else {
|
||||||
if (LOG.isDebugEnabled())
|
if (LOG.isDebugEnabled())
|
||||||
LOG.debug("Skipping creation of .regioninfo file for " + regionInfo);
|
LOG.debug("Skipping creation of .regioninfo file for " + regionInfo);
|
||||||
}
|
}
|
||||||
return null;
|
return regionFs;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -45,7 +45,6 @@ import org.apache.hadoop.hbase.util.FSUtils;
|
||||||
import org.junit.AfterClass;
|
import org.junit.AfterClass;
|
||||||
import org.junit.BeforeClass;
|
import org.junit.BeforeClass;
|
||||||
import org.junit.ClassRule;
|
import org.junit.ClassRule;
|
||||||
import org.junit.Ignore;
|
|
||||||
import org.junit.Rule;
|
import org.junit.Rule;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import org.junit.experimental.categories.Category;
|
import org.junit.experimental.categories.Category;
|
||||||
|
@ -101,7 +100,6 @@ public class TestRegionOpen {
|
||||||
assertEquals(completed + 1, exec.getCompletedTaskCount());
|
assertEquals(completed + 1, exec.getCompletedTaskCount());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Ignore // Needs rewrite since HBASE-19391 which returns null out of createRegionOnFileSystem
|
|
||||||
@Test
|
@Test
|
||||||
public void testNonExistentRegionReplica() throws Exception {
|
public void testNonExistentRegionReplica() throws Exception {
|
||||||
final TableName tableName = TableName.valueOf(name.getMethodName());
|
final TableName tableName = TableName.valueOf(name.getMethodName());
|
||||||
|
|
Loading…
Reference in New Issue