Skip to content

Commit

Permalink
HBASE-24916: Region hole contains wrong regions pair when hole is cre… (
Browse files Browse the repository at this point in the history 
#2304)


Signed-off-by: stack <stack@apache.org>
  • Loading branch information
@arshadmohammad
arshadmohammad authored Aug 30, 2020
1 parent 1c568ec commit bb64070
Show file tree
Hide file tree
Showing 2 changed files with 107 additions and 6 deletions.
13 changes: 9 additions & 4 deletions hbase-server/src/main/java/org/apache/hadoop/hbase/master/CatalogJanitor.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -625,12 +625,17 @@ private RegionInfo metaTableConsistencyCheck(Result metaTableRow) {
// If table is disabled, skip integrity check.
if (!isTableDisabled(ri)) {
if (isTableTransition(ri)) {
// On table transition, look to see if last region was last in table
// and if this is the first. Report 'hole' if neither is true.
// HBCK1 used to have a special category for missing start or end keys.
// We'll just lump them in as 'holes'.
if ((this.previous != null && !this.previous.isLast()) || !ri.isFirst()) {
addHole(this.previous == null? RegionInfo.UNDEFINED: this.previous, ri);

// This is a table transition. If this region is not first region, report a hole.
if (!ri.isFirst()) {
addHole(RegionInfo.UNDEFINED, ri);
}
// This is a table transition. If last region was not last region of previous table,
// report a hole
if (this.previous != null && !this.previous.isLast()) {
addHole(this.previous, RegionInfo.UNDEFINED);
}
} else {
if (!this.previous.isNext(ri)) {
Expand Down
100 changes: 98 additions & 2 deletions hbase-server/src/test/java/org/apache/hadoop/hbase/master/TestCatalogJanitorCluster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;

import java.io.IOException;
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
import org.apache.hadoop.hbase.CatalogFamilyFormat;
import org.apache.hadoop.hbase.HBaseClassTestRule;
Expand All @@ -36,6 +38,7 @@
import org.apache.hadoop.hbase.testclassification.LargeTests;
import org.apache.hadoop.hbase.testclassification.MasterTests;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.Pair;
import org.junit.After;
import org.junit.Before;
import org.junit.ClassRule;
Expand Down Expand Up @@ -115,8 +118,8 @@ public void testConsistency() throws IOException {
report = janitor.getLastReport();
assertFalse(report.isEmpty());
assertEquals(1, report.getHoles().size());
assertTrue(report.getHoles().get(0).getFirst().getTable().equals(T1));
assertTrue(report.getHoles().get(0).getFirst().isLast());
assertTrue(
report.getHoles().get(0).getFirst().getTable().equals(RegionInfo.UNDEFINED.getTable()));
assertTrue(report.getHoles().get(0).getSecond().getTable().equals(T2));
assertEquals(0, report.getOverlaps().size());
// Next, add overlaps to first row in t3
Expand Down Expand Up @@ -231,4 +234,97 @@ public void testConsistency() throws IOException {
row[row.length - 1] = (byte)(((int)row[row.length - 1]) + 1);
return row;
}

@Test
public void testHoles() throws IOException {
CatalogJanitor janitor = TEST_UTIL.getHBaseCluster().getMaster().getCatalogJanitor();

CatalogJanitor.Report report = janitor.getLastReport();
// Assert no problems.
assertTrue(report.isEmpty());
//Verify start and end region holes
verifyCornerHoles(janitor, T1);
//Verify start and end region holes
verifyCornerHoles(janitor, T2);
verifyMiddleHole(janitor);
//Verify that MetaFixer is able to fix these holes
fixHoles(janitor);
}

private void fixHoles(CatalogJanitor janitor) throws IOException {
MetaFixer metaFixer = new MetaFixer(TEST_UTIL.getHBaseCluster().getMaster());
janitor.scan();
CatalogJanitor.Report report = janitor.getLastReport();
//Verify total number of holes, 2 in t1 and t2 each and one in t3
assertEquals("Number of holes are not matching", 5, report.getHoles().size());
metaFixer.fix();
janitor.scan();
report = janitor.getLastReport();
assertEquals("Holes are not fixed", 0, report.getHoles().size());
}

private void verifyMiddleHole(CatalogJanitor janitor) throws IOException {
//Verify middle holes
RegionInfo firstRegion = getRegionInfo(T3, "".getBytes());
RegionInfo secondRegion = getRegionInfo(T3, "bbb".getBytes());
RegionInfo thirdRegion = getRegionInfo(T3, "ccc".getBytes());
MetaTableAccessor.deleteRegionInfo(TEST_UTIL.getConnection(), secondRegion);
LinkedList<Pair<RegionInfo, RegionInfo>> holes = getHoles(janitor, T3);
Pair<RegionInfo, RegionInfo> regionInfoRegionInfoPair = holes.getFirst();
assertTrue(regionInfoRegionInfoPair.getFirst().getTable().equals(T3));
assertTrue(regionInfoRegionInfoPair.getSecond().getTable().equals(T3));
assertTrue(
regionInfoRegionInfoPair.getFirst().getEncodedName().equals(firstRegion.getEncodedName()));
assertTrue(
regionInfoRegionInfoPair.getSecond().getEncodedName().equals(thirdRegion.getEncodedName()));
}

private void verifyCornerHoles(CatalogJanitor janitor, TableName tableName) throws IOException {
RegionInfo firstRegion = getRegionInfo(tableName, "".getBytes());
RegionInfo secondRegion = getRegionInfo(tableName, "bbb".getBytes());
MetaTableAccessor.deleteRegionInfo(TEST_UTIL.getConnection(), firstRegion);
LinkedList<Pair<RegionInfo, RegionInfo>> holes = getHoles(janitor, tableName);

assertEquals(1, holes.size());
Pair<RegionInfo, RegionInfo> regionInfoRegionInfoPair = holes.get(0);
assertTrue(
regionInfoRegionInfoPair.getFirst().getTable().equals(RegionInfo.UNDEFINED.getTable()));
assertTrue(regionInfoRegionInfoPair.getSecond().getTable().equals(tableName));
assertTrue(
regionInfoRegionInfoPair.getSecond().getEncodedName().equals(secondRegion.getEncodedName()));

RegionInfo lastRegion = getRegionInfo(tableName, "zzz".getBytes());
RegionInfo secondLastRegion = getRegionInfo(tableName, "yyy".getBytes());
MetaTableAccessor.deleteRegionInfo(TEST_UTIL.getConnection(), lastRegion);
holes = getHoles(janitor, tableName);
assertEquals(2, holes.size());
regionInfoRegionInfoPair = holes.get(1);
assertTrue(regionInfoRegionInfoPair.getFirst().getEncodedName()
.equals(secondLastRegion.getEncodedName()));
assertTrue(
regionInfoRegionInfoPair.getSecond().getTable().equals(RegionInfo.UNDEFINED.getTable()));
}

//Get Holes filter by table
private LinkedList<Pair<RegionInfo, RegionInfo>> getHoles(CatalogJanitor janitor,
TableName tableName) throws IOException {
janitor.scan();
CatalogJanitor.Report lastReport = janitor.getLastReport();
assertFalse(lastReport.isEmpty());
LinkedList<Pair<RegionInfo, RegionInfo>> holes = new LinkedList<>();
for (Pair<RegionInfo, RegionInfo> hole : lastReport.getHoles()) {
if (hole.getFirst().getTable().equals(tableName) || hole.getSecond().getTable()
.equals(tableName)) {
holes.add(hole);
}
}
return holes;
}

private RegionInfo getRegionInfo(TableName tableName, byte[] row) throws IOException {
RegionInfo regionInfo =
TEST_UTIL.getConnection().getRegionLocator(tableName).getRegionLocation(row).getRegion();
assertNotNull(regionInfo);
return regionInfo;
}
}

0 comments on commit bb64070

Please sign in to comment.