From a5d578ccf0b0e9e0ee805381c47dca1b92148a45 Mon Sep 17 00:00:00 2001 From: Esteban Gutierrez Date: Fri, 21 Jul 2017 13:13:00 -0500 Subject: [PATCH] HBASE-18024 HRegion#initializeRegionInternals should not re-create .hregioninfo file when the region directory no longer exists --- .../hbase/regionserver/HRegionFileSystem.java | 12 ++++++- .../hadoop/hbase/regionserver/TestHRegion.java | 7 +++- .../hadoop/hbase/regionserver/TestRegionOpen.java | 40 +++++++++++++++++++++- 3 files changed, 56 insertions(+), 3 deletions(-) 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 59a0fe5d3d..cd2de12b78 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 @@ -893,9 +893,19 @@ public class HRegionFileSystem { // only should be sufficient. I don't want to read the file every time to check if it pb // serialized. byte[] content = getRegionInfoFileContent(regionInfoForFs); + + // Verify if the region directory exists before opening a region. We need to do this since if + // the region directory doesn't exist we will re-create the region directory and a new HRI + // when HRegion.openHRegion() is called. try { - Path regionInfoFile = new Path(getRegionDir(), REGION_INFO_FILE); + FileStatus status = fs.getFileStatus(getRegionDir()); + } catch (FileNotFoundException e) { + throw new IOException(getRegionDir() + " doesn't exist for region: " + regionInfoForFs.getEncodedName() + + " on table " + regionInfo.getTable()); + } + try { + Path regionInfoFile = new Path(getRegionDir(), REGION_INFO_FILE); FileStatus status = fs.getFileStatus(regionInfoFile); if (status != null && status.getLen() == content.length) { // Then assume the content good and move on. diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java index 569f4f2610..907a52168c 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java @@ -5899,6 +5899,10 @@ public class TestHRegion { @Test public void testCloseRegionWrittenToWAL() throws Exception { + + Path rootDir = new Path(dir + name.getMethodName()); + FSUtils.setRootDir(TEST_UTIL.getConfiguration(), rootDir); + final ServerName serverName = ServerName.valueOf("testCloseRegionWrittenToWAL", 100, 42); final RegionServerServices rss = spy(TEST_UTIL.createMockRegionServerService(serverName)); @@ -5916,7 +5920,8 @@ public class TestHRegion { when(rss.getWAL((HRegionInfo) any())).thenReturn(wal); - // open a region first so that it can be closed later + // create and then open a region first so that it can be closed later + region = HRegion.createHRegion(hri, rootDir, TEST_UTIL.getConfiguration(), htd, rss.getWAL(hri)); region = HRegion.openHRegion(hri, htd, rss.getWAL(hri), TEST_UTIL.getConfiguration(), rss, null); 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 f49bdb1145..13da173450 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 @@ -20,6 +20,8 @@ package org.apache.hadoop.hbase.regionserver; import static org.junit.Assert.assertEquals; +import java.io.IOException; +import java.util.List; import java.util.concurrent.ThreadPoolExecutor; import org.apache.commons.logging.Log; @@ -29,16 +31,21 @@ import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.executor.ExecutorType; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.testclassification.RegionServerTests; import org.apache.hadoop.hbase.client.Admin; import org.apache.hadoop.hbase.client.Connection; +import org.apache.hadoop.hbase.util.Bytes; import org.junit.AfterClass; import org.junit.BeforeClass; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.TestName; +import static org.junit.Assert.fail; @Category({MediumTests.class, RegionServerTests.class}) public class TestRegionOpen { @@ -47,7 +54,9 @@ public class TestRegionOpen { private static final int NB_SERVERS = 1; private static final HBaseTestingUtility HTU = new HBaseTestingUtility(); - final TableName tableName = TableName.valueOf(TestRegionOpen.class.getSimpleName()); + + @Rule + public TestName name = new TestName(); @BeforeClass public static void before() throws Exception { @@ -65,6 +74,7 @@ public class TestRegionOpen { @Test(timeout = 60000) public void testPriorityRegionIsOpenedWithSeparateThreadPool() throws Exception { + final TableName tableName = TableName.valueOf(TestRegionOpen.class.getSimpleName()); ThreadPoolExecutor exec = getRS().getExecutorService() .getExecutorThreadPool(ExecutorType.RS_OPEN_PRIORITY_REGION); @@ -80,4 +90,32 @@ public class TestRegionOpen { assertEquals(1, exec.getCompletedTaskCount()); } + + @Test(timeout = 60000) + public void testNonExistingRegion() throws Exception { + final TableName tableName = TableName.valueOf(name.getMethodName()); + final byte[] FAMILYNAME = Bytes.toBytes("fam"); + Admin admin = HTU.getAdmin(); + + HTableDescriptor htd = new HTableDescriptor(tableName); + htd.addFamily(new HColumnDescriptor(FAMILYNAME)); + admin.createTable(htd); + HTU.waitUntilNoRegionsInTransition(60000); + + HRegionInfo hri = new HRegionInfo(htd.getTableName(), Bytes.toBytes("A"), Bytes.toBytes("B")); + try { + HRegion region = HRegion.openHRegion(hri, htd, null, HTU.getConfiguration()); + } catch (IOException e) { + LOG.info("Caught expected IOE due missing region directory, skipping region open."); + // We should only have 1 region online + List regions = admin.getTableRegions(tableName); + LOG.info("Regions: " + regions); + if (regions.size() <= 0 || regions.size() > 1) { + fail("Table " + tableName + " should have only one region, but got more: " + regions); + } + return; + } + + fail("Should have thrown IOE when attempting to open a non-existing region."); + } } -- 2.13.3