You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2016/02/10 09:05:01 UTC
hbase git commit: HBASE-15125 HBaseFsck's adoptHdfsOrphan function
creates region with wrong end key boundary (chenrongwei)
Repository: hbase
Updated Branches:
refs/heads/0.98 52355ab1d -> fb2657936
HBASE-15125 HBaseFsck's adoptHdfsOrphan function creates region with wrong end key boundary (chenrongwei)
Amending-Author: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/fb265793
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/fb265793
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/fb265793
Branch: refs/heads/0.98
Commit: fb2657936fd0375d976516158d75e4c6233352dd
Parents: 52355ab
Author: tedyu <yu...@gmail.com>
Authored: Sat Jan 23 12:47:41 2016 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Wed Feb 10 00:00:41 2016 -0800
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/util/HBaseFsck.java | 3 +-
.../apache/hadoop/hbase/util/TestHBaseFsck.java | 62 +++++++++++++++++++-
2 files changed, 63 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/fb265793/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
index 4f795ce..4311ca5 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
@@ -810,7 +810,8 @@ public class HBaseFsck extends Configured {
Bytes.toString(orphanRegionRange.getSecond()) + ")");
// create new region on hdfs. move data into place.
- HRegionInfo hri = new HRegionInfo(template.getTableName(), orphanRegionRange.getFirst(), orphanRegionRange.getSecond());
+ HRegionInfo hri = new HRegionInfo(template.getTableName(), orphanRegionRange.getFirst(),
+ Bytes.add(orphanRegionRange.getSecond(), new byte[1]));
LOG.info("Creating new region : " + hri);
HRegion region = HBaseFsckRepair.createHDFSRegionDir(getConf(), hri, template);
Path target = region.getRegionFileSystem().getRegionDir();
http://git-wip-us.apache.org/repos/asf/hbase/blob/fb265793/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
index c9d49e8..3557c4d 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java
@@ -389,7 +389,7 @@ public class TestHBaseFsck {
}
/**
- * Counts the number of row to verify data loss or non-dataloss.
+ * Counts the number of rows to verify data loss or non-dataloss.
*/
int countRows() throws IOException {
Scan s = new Scan();
@@ -402,6 +402,18 @@ public class TestHBaseFsck {
}
/**
+ * Counts the number of rows to verify data loss or non-dataloss.
+ */
+ int countRows(byte[] start, byte[] end) throws IOException {
+ Scan s = new Scan(start, end);
+ ResultScanner rs = tbl.getScanner(s);
+ int i = 0;
+ while (rs.next() != null) {
+ i++;
+ }
+ return i;
+ }
+ /**
* delete table in preparation for next test
*
* @param tablename
@@ -1035,6 +1047,54 @@ public class TestHBaseFsck {
}
/**
+ * This creates and fixes a bad table with a missing region -- hole in meta and data present but
+ * .regioninfo missing (an orphan hdfs region)in the fs. At last we check every row was present
+ * at the correct region.
+ */
+ @Test(timeout = 180000)
+ public void testHDFSRegioninfoMissingAndCheckRegionBoundary() throws Exception {
+ TableName table = TableName.valueOf("testHDFSRegioninfoMissingAndCheckRegionBoundary");
+ try {
+ setupTable(table);
+ assertEquals(ROWKEYS.length, countRows());
+
+ // Mess it up by leaving a hole in the meta data
+ HBaseAdmin admin = TEST_UTIL.getHBaseAdmin();
+ admin.disableTable(table);
+ deleteRegion(conf, tbl.getTableDescriptor(), Bytes.toBytes("B"), Bytes.toBytes("C"), true,
+ true, false, true);
+ admin.enableTable(table);
+
+ HBaseFsck hbck = doFsck(conf, false);
+ assertErrors(hbck,
+ new HBaseFsck.ErrorReporter.ERROR_CODE[] {
+ HBaseFsck.ErrorReporter.ERROR_CODE.ORPHAN_HDFS_REGION,
+ HBaseFsck.ErrorReporter.ERROR_CODE.NOT_IN_META_OR_DEPLOYED,
+ HBaseFsck.ErrorReporter.ERROR_CODE.HOLE_IN_REGION_CHAIN });
+ // holes are separate from overlap groups
+ assertEquals(0, hbck.getOverlapGroups(table).size());
+
+ // fix hole
+ doFsck(conf, true);
+
+ // check that hole fixed
+ assertNoErrors(doFsck(conf, false));
+
+ // check data belong to the correct region,every scan should get one row.
+ for (int i = 0; i < ROWKEYS.length; i++) {
+ if (i != ROWKEYS.length - 1) {
+ assertEquals(1, countRows(ROWKEYS[i], ROWKEYS[i + 1]));
+ } else {
+ assertEquals(1, countRows(ROWKEYS[i], null));
+ }
+ }
+
+ } finally {
+ deleteTable(table);
+ }
+ }
+
+ /**
* This creates and fixes a bad table with a region that is missing meta and
* not assigned to a region server.
*/