Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some fixup of hbck log messages -- added info 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1042060 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-12-04 00:10:23 +00:00
parent fe2e720318
commit 1da8a78ff9
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
View File

@ -244,12 +244,14 @@ public class HBaseFsck {
// This is special case if a region is left after split // This is special case if a region is left after split
hbi.onlyEdits = true; hbi.onlyEdits = true;
FileStatus[] subDirs = fs.listStatus(regionDir.getPath()); FileStatus[] subDirs = fs.listStatus(regionDir.getPath());
Path ePath = HLog.getRegionDirRecoveredEditsDir(regionDir.getPath()); if (subDirs != null) {
for (FileStatus subDir : subDirs) { Path ePath = HLog.getRegionDirRecoveredEditsDir(regionDir.getPath());
String sdName = subDir.getPath().getName(); for (FileStatus subDir : subDirs) {
if (!sdName.startsWith(".") && !sdName.equals(ePath.getName())) { String sdName = subDir.getPath().getName();
hbi.onlyEdits = false; if (!sdName.startsWith(".") && !sdName.equals(ePath.getName())) {
break; hbi.onlyEdits = false;
break;
}
} }
} }
} }
@ -324,15 +326,16 @@ public class HBaseFsck {
* Check consistency of all regions that have been found in previous phases. * Check consistency of all regions that have been found in previous phases.
*/ */
void checkConsistency() throws IOException { void checkConsistency() throws IOException {
for (HbckInfo hbi : regionInfo.values()) { for (java.util.Map.Entry<String, HbckInfo> e: regionInfo.entrySet()) {
doConsistencyCheck(hbi); doConsistencyCheck(e.getKey(), e.getValue());
} }
} }
/** /**
* Check a single region for consistency and correct deployment. * Check a single region for consistency and correct deployment.
*/ */
void doConsistencyCheck(HbckInfo hbi) throws IOException { void doConsistencyCheck(final String key, final HbckInfo hbi)
throws IOException {
String descriptiveName = hbi.toString(); String descriptiveName = hbi.toString();
boolean inMeta = hbi.metaEntry != null; boolean inMeta = hbi.metaEntry != null;
@ -366,7 +369,7 @@ public class HBaseFsck {
// We shouldn't have record of this region at all then! // We shouldn't have record of this region at all then!
assert false : "Entry for region with no data"; assert false : "Entry for region with no data";
} else if (!inMeta && !inHdfs && isDeployed) { } else if (!inMeta && !inHdfs && isDeployed) {
errors.reportError("Region " + descriptiveName + " not on HDFS or in META but " + errors.reportError("Region " + descriptiveName + ", key=" + key + ", not on HDFS or in META but " +
"deployed on " + Joiner.on(", ").join(hbi.deployedOn)); "deployed on " + Joiner.on(", ").join(hbi.deployedOn));
} else if (!inMeta && inHdfs && !isDeployed) { } else if (!inMeta && inHdfs && !isDeployed) {
errors.reportError("Region " + descriptiveName + " on HDFS, but not listed in META " + errors.reportError("Region " + descriptiveName + " on HDFS, but not listed in META " +
@ -391,7 +394,7 @@ public class HBaseFsck {
HBaseFsckRepair.fixUnassigned(this.conf, hbi.metaEntry); HBaseFsckRepair.fixUnassigned(this.conf, hbi.metaEntry);
} }
} else if (inMeta && inHdfs && isDeployed && !shouldBeDeployed) { } else if (inMeta && inHdfs && isDeployed && !shouldBeDeployed) {
errors.reportError("Region " + descriptiveName + " has should not be deployed according " + errors.reportError("Region " + descriptiveName + " should not be deployed according " +
"to META, but is deployed on " + Joiner.on(", ").join(hbi.deployedOn)); "to META, but is deployed on " + Joiner.on(", ").join(hbi.deployedOn));
} else if (inMeta && inHdfs && isMultiplyDeployed) { } else if (inMeta && inHdfs && isMultiplyDeployed) {
errors.reportError("Region " + descriptiveName + " is listed in META on region server " + errors.reportError("Region " + descriptiveName + " is listed in META on region server " +
@ -732,7 +735,7 @@ public class HBaseFsck {
} else if (foundRegionDir != null) { } else if (foundRegionDir != null) {
return foundRegionDir.getPath().toString(); return foundRegionDir.getPath().toString();
} else { } else {
return "unknown region on " + Joiner.on(", ").join(deployedOn); return "UNKNOWN_REGION on " + Joiner.on(", ").join(deployedOn);
} }
} }
} }