Index: src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (revision 1307225) +++ src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (working copy) @@ -156,6 +156,7 @@ private boolean fixHdfsHoles = false; // fix fs holes? private boolean fixHdfsOverlaps = false; // fix fs overlaps (risky) private boolean fixHdfsOrphans = false; // fix fs holes (missing .regioninfo) + private boolean fixVersionFile = false; // fix the hbase.version missing // limit fixes to listed tables, if empty atttempt to fix all private List tablesToFix = new ArrayList(); @@ -975,6 +976,13 @@ if (!foundVersionFile) { errors.reportError(ERROR_CODE.NO_VERSION_FILE, "Version file does not exist in root dir " + rootDir); + if (shouldFixVersionFile()) { + LOG.info("Trying to create a new " + HConstants.VERSION_FILE_NAME + + " file."); + setShouldRerun(); + FSUtils.setVersion(fs, rootDir, + conf.getInt(HConstants.THREAD_WAKE_FREQUENCY, 10 * 1000)); + } } // level 1: /* @@ -1302,10 +1310,15 @@ + " not deployed on any region server."); tryAssignmentRepair(hbi, "Trying to fix unassigned region..."); } else if (inMeta && inHdfs && isDeployed && !shouldBeDeployed) { - errors.reportError(ERROR_CODE.SHOULD_NOT_BE_DEPLOYED, "UNHANDLED CASE:" + - " Region " + descriptiveName + " should not be deployed according " + + errors.reportError(ERROR_CODE.SHOULD_NOT_BE_DEPLOYED, + "Region " + descriptiveName + " should not be deployed according " + "to META, but is deployed on " + Joiner.on(", ").join(hbi.deployedOn)); // TODO test and handle this case. + if (shouldFixAssignments()) { + errors.print("Trying to unassign the region " + descriptiveName); + setShouldRerun(); + admin.getMaster().unassign(hbi.metaEntry.getRegionName(), false); + } } else if (inMeta && inHdfs && isMultiplyDeployed) { errors.reportError(ERROR_CODE.MULTI_DEPLOYED, "Region " + descriptiveName + " is listed in META on region server " + hbi.metaEntry.regionServer @@ -2714,7 +2727,15 @@ boolean shouldFixHdfsOrphans() { return fixHdfsOrphans; } + + public void setFixVersionFile(boolean shouldFix) { + fixVersionFile = shouldFix; + } + public boolean shouldFixVersionFile() { + return fixVersionFile; + } + /** * @param mm maximum number of regions to merge into a single region. */ @@ -2773,9 +2794,10 @@ System.err.println(" -fixHdfsHoles Try to fix region holes in hdfs."); System.err.println(" -fixHdfsOrphans Try to fix region dirs with no .regioninfo file in hdfs"); System.err.println(" -fixHdfsOverlaps Try to fix region overlaps in hdfs."); + System.err.println(" -fixVersionFile Try to fix the hbase.version missing."); System.err.println(" -maxMerge When fixing region overlaps, allow at most regions to merge. (n=" + DEFAULT_MAX_MERGE +" by default)"); System.err.println(""); - System.err.println(" -repair Shortcut for -fixAssignments -fixMeta -fixHdfsHoles -fixHdfsOrphans -fixHdfsOverlaps"); + System.err.println(" -repair Shortcut for -fixAssignments -fixMeta -fixHdfsHoles -fixHdfsOrphans -fixHdfsOverlaps -fixVersionFile"); System.err.println(" -repairHoles Shortcut for -fixAssignments -fixMeta -fixHdfsHoles -fixHdfsOrphans"); Runtime.getRuntime().exit(-2); @@ -2838,6 +2860,8 @@ fsck.setFixHdfsOrphans(true); } else if (cmd.equals("-fixHdfsOverlaps")) { fsck.setFixHdfsOverlaps(true); + } else if (cmd.equals("-fixVersionFile")) { + fsck.setFixVersionFile(true); } else if (cmd.equals("-repair")) { // this attempts to merge overlapping hdfs regions, needs testing // under load @@ -2846,6 +2870,7 @@ fsck.setFixMeta(true); fsck.setFixAssignments(true); fsck.setFixHdfsOverlaps(true); + fsck.setFixVersionFile(true); } else if (cmd.equals("-repairHoles")) { // this will make all missing hdfs regions available but may lose data fsck.setFixHdfsHoles(true); @@ -2897,6 +2922,7 @@ fsck.setFixHdfsHoles(false); fsck.setFixHdfsOverlaps(false); fsck.setFixHdfsOrphans(false); + fsck.setFixVersionFile(false); fsck.errors.resetErrors(); code = fsck.onlineHbck(); } Index: src/main/java/org/apache/hadoop/hbase/util/Merge.java =================================================================== --- src/main/java/org/apache/hadoop/hbase/util/Merge.java (revision 1307225) +++ src/main/java/org/apache/hadoop/hbase/util/Merge.java (working copy) @@ -381,6 +381,12 @@ LOG.error("exiting due to error", e); status = -1; } + + if (0 == status) { + LOG.info("Success to merge the regions."); + } else { + LOG.error("Failed to merge the regions."); + } System.exit(status); } } Index: src/test/java/org/apache/hadoop/hbase/util/hbck/HbckTestingUtil.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/util/hbck/HbckTestingUtil.java (revision 1307225) +++ src/test/java/org/apache/hadoop/hbase/util/hbck/HbckTestingUtil.java (working copy) @@ -29,12 +29,12 @@ public class HbckTestingUtil { public static HBaseFsck doFsck(Configuration conf, boolean fix) throws Exception { - return doFsck(conf, fix, fix, fix, fix,fix); + return doFsck(conf, fix, fix, fix, fix,fix, fix); } public static HBaseFsck doFsck(Configuration conf, boolean fixAssignments, boolean fixMeta, boolean fixHdfsHoles, boolean fixHdfsOverlaps, - boolean fixHdfsOrphans) throws Exception { + boolean fixHdfsOrphans, boolean fixVersionFile) throws Exception { HBaseFsck fsck = new HBaseFsck(conf); fsck.connect(); fsck.setDisplayFullReport(); // i.e. -details @@ -44,6 +44,7 @@ fsck.setFixHdfsHoles(fixHdfsHoles); fsck.setFixHdfsOverlaps(fixHdfsOverlaps); fsck.setFixHdfsOrphans(fixHdfsOrphans); + fsck.setFixVersionFile(fixVersionFile); fsck.onlineHbck(); return fsck; } Index: src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java =================================================================== --- src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (revision 1307225) +++ src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java (working copy) @@ -56,6 +56,7 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.ipc.HRegionInterface; import org.apache.hadoop.hbase.regionserver.HRegion; +import org.apache.hadoop.hbase.util.HBaseFsck; import org.apache.hadoop.hbase.util.HBaseFsck.ErrorReporter.ERROR_CODE; import org.apache.zookeeper.KeeperException; import org.junit.AfterClass; @@ -789,4 +790,25 @@ } fail("Should have failed with IOException"); } + + /** + * when the hbase.version file missing, It is fix the fault. + */ + @Test + public void testNoVersionFile() throws Exception { + // delete the hbase.version file + Path rootDir = new Path(conf.get(HConstants.HBASE_DIR)); + FileSystem fs = rootDir.getFileSystem(conf); + Path versionFile = new Path(rootDir, HConstants.VERSION_FILE_NAME); + fs.delete(versionFile, true); + + // test + HBaseFsck hbck = doFsck(conf, false); + assertErrors(hbck, new ERROR_CODE[] { ERROR_CODE.NO_VERSION_FILE }); + // fix hbase.version missing + doFsck(conf, true); + + // no version file fixed + assertNoErrors(doFsck(conf, false)); + } }