Repository: hbase Updated Branches: refs/heads/branch-1.3 52c2dcbaa -> 77847da92
HBASE-18024 HRegion#initializeRegionInternals should not re-create .hregioninfo file when the region directory no longer exists Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/77847da9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/77847da9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/77847da9 Branch: refs/heads/branch-1.3 Commit: 77847da928f9ee79674f54f8dc517fdbde35287f Parents: 52c2dcb Author: Esteban Gutierrez <este...@apache.org> Authored: Fri Jul 21 13:13:00 2017 -0500 Committer: Esteban Gutierrez <este...@apache.org> Committed: Thu Aug 10 18:41:20 2017 -0500 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/HRegion.java | 11 +++- .../hbase/regionserver/HRegionFileSystem.java | 31 +++++++++-- .../hadoop/hbase/regionserver/TestHRegion.java | 7 ++- .../hbase/regionserver/TestRegionOpen.java | 56 +++++++++++++++++++- .../TestStoreFileRefresherChore.java | 2 + 5 files changed, 99 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/77847da9/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 4ba66b7..718fe74 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -820,8 +820,15 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } // Write HRI to a file in case we need to recover hbase:meta - status.setStatus("Writing region info on filesystem"); - fs.checkRegionInfoOnFilesystem(); + // Only the primary replica should write .regioninfo + if (this.getRegionInfo().getReplicaId() == HRegionInfo.DEFAULT_REPLICA_ID) { + status.setStatus("Writing region info on filesystem"); + fs.checkRegionInfoOnFilesystem(); + } else { + if (LOG.isDebugEnabled()) { + LOG.debug("Skipping creation of .regioninfo file for " + this.getRegionInfo()); + } + } // Initialize all the HStores status.setStatus("Initializing all the Stores"); http://git-wip-us.apache.org/repos/asf/hbase/blob/77847da9/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 19e8c45..619358c 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 @@ -798,9 +798,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) { + LOG.warn(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. @@ -893,7 +903,13 @@ public class HRegionFileSystem { } // Write HRI to a file in case we need to recover hbase:meta - regionFs.writeRegionInfoOnFilesystem(false); + // Only primary replicas should write region info + if (regionInfo.getReplicaId() == HRegionInfo.DEFAULT_REPLICA_ID) { + regionFs.writeRegionInfoOnFilesystem(false); + } else { + if (LOG.isDebugEnabled()) + LOG.debug("Skipping creation of .regioninfo file for " + regionInfo); + } return regionFs; } @@ -923,8 +939,15 @@ public class HRegionFileSystem { regionFs.cleanupSplitsDir(); regionFs.cleanupMergesDir(); - // if it doesn't exists, Write HRI to a file, in case we need to recover hbase:meta - regionFs.checkRegionInfoOnFilesystem(); + // If it doesn't exists, Write HRI to a file, in case we need to recover hbase:meta + // Only create HRI if we are the default replica + if (regionInfo.getReplicaId() == HRegionInfo.DEFAULT_REPLICA_ID) { + regionFs.checkRegionInfoOnFilesystem(); + } else { + if (LOG.isDebugEnabled()) { + LOG.debug("Skipping creation of .regioninfo file for " + regionInfo); + } + } } return regionFs; http://git-wip-us.apache.org/repos/asf/hbase/blob/77847da9/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestHRegion.java ---------------------------------------------------------------------- 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 2b0a768..3d1ec1c 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 @@ -6200,6 +6200,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)); @@ -6218,7 +6222,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); http://git-wip-us.apache.org/repos/asf/hbase/blob/77847da9/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 aac872d..edb1d52 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 @@ -19,26 +19,39 @@ package org.apache.hadoop.hbase.regionserver; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.io.IOException; +import java.util.List; import java.util.concurrent.ThreadPoolExecutor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseTestingUtility; 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.apache.hadoop.hbase.util.FSUtils; 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 +60,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 +80,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 +96,42 @@ public class TestRegionOpen { assertEquals(2, exec.getCompletedTaskCount()); } + + @Test(timeout = 60000) + public void testNonExistentRegionReplica() throws Exception { + final TableName tableName = TableName.valueOf(name.getMethodName()); + final byte[] FAMILYNAME = Bytes.toBytes("fam"); + FileSystem fs = HTU.getTestFileSystem(); + Connection connection = HTU.getConnection(); + Admin admin = connection.getAdmin(); + Configuration conf = HTU.getConfiguration(); + Path rootDir = HTU.getDataTestDirOnTestFS(); + + HTableDescriptor htd = new HTableDescriptor(tableName); + htd.addFamily(new HColumnDescriptor(FAMILYNAME)); + admin.createTable(htd); + HTU.waitUntilNoRegionsInTransition(60000); + + // Create new HRI with non-default region replica id + HRegionInfo hri = new HRegionInfo(htd.getTableName(), Bytes.toBytes("A"), Bytes.toBytes("B"), false, + System.currentTimeMillis(), 2); + HRegionFileSystem regionFs = HRegionFileSystem.createRegionOnFileSystem(conf, fs, + FSUtils.getTableDir(rootDir, hri.getTable()), hri); + Path regionDir = regionFs.getRegionDir(); + try { + HRegionFileSystem.loadRegionInfoFileContent(fs, regionDir); + } catch (IOException e) { + LOG.info("Caught expected IOE due missing .regioninfo file, due: " + e.getMessage() + " skipping region open."); + // We should only have 1 region online + List<HRegionInfo> regions = admin.getTableRegions(tableName); + LOG.info("Regions: " + regions); + if (regions.size() != 1) { + fail("Table " + tableName + " should have only one region, but got more: " + regions); + } + return; + } finally { + admin.close(); + } + fail("Should have thrown IOE when attempting to open a non-existing region."); + } } http://git-wip-us.apache.org/repos/asf/hbase/blob/77847da9/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java index ab9236d..455be4a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestStoreFileRefresherChore.java @@ -169,6 +169,8 @@ public class TestStoreFileRefresherChore { when(regionServer.getConfiguration()).thenReturn(TEST_UTIL.getConfiguration()); HTableDescriptor htd = getTableDesc(TableName.valueOf("testIsStale"), families); + htd.setRegionReplication(2); + Region primary = initHRegion(htd, HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW, 0); Region replica1 = initHRegion(htd, HConstants.EMPTY_START_ROW, HConstants.EMPTY_END_ROW, 1); regions.add(primary);
