You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/06/23 06:43:28 UTC
svn commit: r1353066 - in
/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase: HConstants.java
util/HBaseFsck.java util/hbck/OfflineMetaRepair.java
Author: tedyu
Date: Sat Jun 23 04:43:27 2012
New Revision: 1353066
URL: http://svn.apache.org/viewvc?rev=1353066&view=rev
Log:
HBASE-6236 Addendum adds -sidelineDir option to hbck (Aditya)
Modified:
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java?rev=1353066&r1=1353065&r2=1353066&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/HConstants.java Sat Jun 23 04:43:27 2012
@@ -589,7 +589,7 @@ public final class HConstants {
public static final List<String> HBASE_NON_USER_TABLE_DIRS = new ArrayList<String>(
Arrays.asList(new String[]{ HREGION_LOGDIR_NAME, HREGION_OLDLOGDIR_NAME,
CORRUPT_DIR_NAME, Bytes.toString(META_TABLE_NAME),
- Bytes.toString(ROOT_TABLE_NAME), SPLIT_LOGDIR_NAME,
+ Bytes.toString(ROOT_TABLE_NAME), SPLIT_LOGDIR_NAME,
HBCK_SIDELINEDIR_NAME }));
public static final Pattern CP_HTD_ATTR_KEY_PATTERN = Pattern.compile
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java?rev=1353066&r1=1353065&r2=1353066&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/HBaseFsck.java Sat Jun 23 04:43:27 2012
@@ -2994,19 +2994,20 @@ public class HBaseFsck {
public void setSidelineDir(String sidelineDir) {
this.sidelineDir = new Path(sidelineDir);
}
-
+
protected static void printUsageAndExit() {
System.err.println("Usage: fsck [opts] {only tables}");
System.err.println(" where [opts] are:");
System.err.println(" -help Display help options (this)");
System.err.println(" -details Display full report of all regions.");
- System.err.println(" -timelag {timeInSeconds} Process only regions that " +
+ System.err.println(" -timelag <timeInSeconds> Process only regions that " +
" have not experienced any metadata updates in the last " +
- " {{timeInSeconds} seconds.");
- System.err.println(" -sleepBeforeRerun {timeInSeconds} Sleep this many seconds" +
+ " <timeInSeconds> seconds.");
+ System.err.println(" -sleepBeforeRerun <timeInSeconds> Sleep this many seconds" +
" before checking if the fix worked if run with -fix");
System.err.println(" -summary Print only summary of the tables and status.");
System.err.println(" -metaonly Only check the state of ROOT and META tables.");
+ System.err.println(" -sidelineDir <hdfs://> HDFS path to backup existing meta and root.");
System.err.println(" Repair options: (expert features, use with caution!)");
System.err.println(" -fix Try to fix region assignments. This is for backwards compatiblity");
@@ -3076,6 +3077,13 @@ public class HBaseFsck {
printUsageAndExit();
}
i++;
+ } else if (cmd.equals("-sidelineDir")) {
+ if (i == args.length - 1) {
+ System.err.println("HBaseFsck: -sidelineDir needs a value.");
+ printUsageAndExit();
+ }
+ i++;
+ fsck.setSidelineDir(args[i]);
} else if (cmd.equals("-fix")) {
System.err.println("This option is deprecated, please use " +
"-fixAssignments instead.");
Modified: hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java
URL: http://svn.apache.org/viewvc/hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java?rev=1353066&r1=1353065&r2=1353066&view=diff
==============================================================================
--- hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java (original)
+++ hbase/branches/0.94/src/main/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRepair.java Sat Jun 23 04:43:27 2012
@@ -80,7 +80,7 @@ public class OfflineMetaRepair {
if (i == args.length - 1) {
System.err.println("OfflineMetaRepair: -base needs an HDFS path.");
printUsageAndExit();
- }
+ }
// update hbase root dir to user-specified base
i++;
String path = args[i];
@@ -94,7 +94,7 @@ public class OfflineMetaRepair {
}
// set the hbck sideline dir to user-specified one
i++;
- fsck.setSidelineDir(args[i]);
+ fsck.setSidelineDir(args[i]);
} else if (cmd.equals("-fixHoles")) {
fixHoles = true;
} else if (cmd.equals("-fix")) {