HBASE-20242 The open sequence number will grow if we fail to open a region after writing the max sequence id file
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/aec43bb2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/aec43bb2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/aec43bb2 Branch: refs/heads/HBASE-20046-branch-2 Commit: aec43bb207a34a1c8830bc0bd649ed060200cac6 Parents: 2b9fed8 Author: zhangduo <zhang...@apache.org> Authored: Wed Mar 21 21:35:34 2018 +0800 Committer: zhangduo <zhang...@apache.org> Committed: Mon Apr 9 15:18:44 2018 +0800 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/HRegion.java | 5 +- .../TestOpenSeqNumUnexpectedIncrease.java | 111 +++++++++++++++++++ 2 files changed, 114 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/aec43bb2/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 23284be..9b9136b 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 @@ -968,7 +968,7 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi WALSplitter.getMaxRegionSequenceId(fs.getFileSystem(), fs.getRegionDir()); long nextSeqId = Math.max(maxSeqId, maxSeqIdFromFile) + 1; if (writestate.writesEnabled) { - WALSplitter.writeRegionSequenceIdFile(fs.getFileSystem(), fs.getRegionDir(), nextSeqId); + WALSplitter.writeRegionSequenceIdFile(fs.getFileSystem(), fs.getRegionDir(), nextSeqId - 1); } LOG.info("Opened {}; next sequenceid={}", this.getRegionInfo().getShortNameToLog(), nextSeqId); @@ -1097,7 +1097,8 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi return allStoreFiles; } - private void writeRegionOpenMarker(WAL wal, long openSeqId) throws IOException { + @VisibleForTesting + protected void writeRegionOpenMarker(WAL wal, long openSeqId) throws IOException { Map<byte[], List<Path>> storeFiles = getStoreFiles(); RegionEventDescriptor regionOpenDesc = ProtobufUtil.toRegionEventDescriptor( RegionEventDescriptor.EventType.REGION_OPEN, getRegionInfo(), openSeqId, http://git-wip-us.apache.org/repos/asf/hbase/blob/aec43bb2/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenSeqNumUnexpectedIncrease.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenSeqNumUnexpectedIncrease.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenSeqNumUnexpectedIncrease.java new file mode 100644 index 0000000..14d5a98 --- /dev/null +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestOpenSeqNumUnexpectedIncrease.java @@ -0,0 +1,111 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.regionserver; + +import static org.junit.Assert.assertEquals; + +import java.io.IOException; +import java.util.concurrent.atomic.AtomicInteger; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.FileSystem; +import org.apache.hadoop.fs.Path; +import org.apache.hadoop.hbase.HBaseClassTestRule; +import org.apache.hadoop.hbase.HBaseTestingUtility; +import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.TableName; +import org.apache.hadoop.hbase.client.RegionInfo; +import org.apache.hadoop.hbase.client.TableDescriptor; +import org.apache.hadoop.hbase.testclassification.MediumTests; +import org.apache.hadoop.hbase.testclassification.RegionServerTests; +import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.wal.WAL; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.ClassRule; +import org.junit.Test; +import org.junit.experimental.categories.Category; + +/** + * Testcase for HBASE-20242 + */ +@Category({ RegionServerTests.class, MediumTests.class }) +public class TestOpenSeqNumUnexpectedIncrease { + + @ClassRule + public static final HBaseClassTestRule CLASS_RULE = + HBaseClassTestRule.forClass(TestOpenSeqNumUnexpectedIncrease.class); + + private static final HBaseTestingUtility UTIL = new HBaseTestingUtility(); + + private static AtomicInteger FAILED_OPEN = new AtomicInteger(0); + + private static TableName TABLE_NAME = TableName.valueOf("test"); + + private static byte[] CF = Bytes.toBytes("CF"); + + public static final class MockHRegion extends HRegion { + + @SuppressWarnings("deprecation") + public MockHRegion(Path tableDir, WAL wal, FileSystem fs, Configuration confParam, + RegionInfo regionInfo, TableDescriptor htd, RegionServerServices rsServices) { + super(tableDir, wal, fs, confParam, regionInfo, htd, rsServices); + } + + @Override + protected void writeRegionOpenMarker(WAL wal, long openSeqId) throws IOException { + if (getRegionInfo().getTable().equals(TABLE_NAME) && FAILED_OPEN.get() > 0) { + FAILED_OPEN.decrementAndGet(); + rsServices.abort("for testing", new Exception("Inject error for testing")); + throw new IOException("Inject error for testing"); + } + } + } + + @BeforeClass + public static void setUp() throws Exception { + UTIL.getConfiguration().setInt(HConstants.HBASE_RPC_TIMEOUT_KEY, 600000); + UTIL.getConfiguration().setClass(HConstants.REGION_IMPL, MockHRegion.class, HRegion.class); + UTIL.startMiniCluster(3); + UTIL.createTable(TABLE_NAME, CF); + UTIL.getAdmin().balancerSwitch(false, true); + } + + @AfterClass + public static void tearDown() throws Exception { + UTIL.shutdownMiniCluster(); + } + + @Test + public void test() throws IOException, InterruptedException { + HRegion region = UTIL.getMiniHBaseCluster().getRegions(TABLE_NAME).get(0); + long openSeqNum = region.getOpenSeqNum(); + HRegionServer src = UTIL.getRSForFirstRegionInTable(TABLE_NAME); + HRegionServer dst = UTIL.getOtherRegionServer(src); + + // will fail two times, and then verify that the open sequence number is still openSeqNum + 2 + FAILED_OPEN.set(2); + UTIL.getAdmin().move(region.getRegionInfo().getEncodedNameAsBytes(), + Bytes.toBytes(dst.getServerName().getServerName())); + UTIL.waitTableAvailable(TABLE_NAME); + + HRegion region1 = UTIL.getMiniHBaseCluster().getRegions(TABLE_NAME).get(0); + long openSeqNum1 = region1.getOpenSeqNum(); + + assertEquals(openSeqNum + 2, openSeqNum1); + } +}
