You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2018/08/28 14:09:24 UTC
hbase git commit: HBASE-20649 Validate HFiles do not have PREFIX_TREE
DataBlockEncoding
Repository: hbase
Updated Branches:
refs/heads/branch-2.0 bfbac7bb7 -> e21b7489a
HBASE-20649 Validate HFiles do not have PREFIX_TREE DataBlockEncoding
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e21b7489
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e21b7489
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e21b7489
Branch: refs/heads/branch-2.0
Commit: e21b7489ae9fef025339eb66b5ea30d2fbe5e058
Parents: bfbac7b
Author: Balazs Meszaros <ba...@cloudera.com>
Authored: Tue Jun 26 10:47:06 2018 +0200
Committer: Michael Stack <st...@apache.org>
Committed: Tue Aug 28 07:09:04 2018 -0700
----------------------------------------------------------------------
.../apache/hadoop/hbase/tool/DataBlockEncodingValidator.java | 5 ++---
.../org/apache/hadoop/hbase/tool/PreUpgradeValidator.java | 7 +++++++
2 files changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e21b7489/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/DataBlockEncodingValidator.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/DataBlockEncodingValidator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/DataBlockEncodingValidator.java
index e72521b..c909725 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/DataBlockEncodingValidator.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/DataBlockEncodingValidator.java
@@ -76,9 +76,8 @@ public class DataBlockEncodingValidator extends AbstractHBaseTool {
if (incompatibilities > 0) {
LOG.warn("There are {} column families with incompatible Data Block Encodings. Do not "
- + "upgrade until these encodings are converted to a supported one.", incompatibilities);
- LOG.warn("Check http://hbase.apache.org/book.html#upgrade2.0.prefix-tree.removed "
- + "for instructions.");
+ + "upgrade until these encodings are converted to a supported one. "
+ + "Check https://s.apache.org/prefixtree for instructions.", incompatibilities);
} else {
LOG.info("The used Data Block Encodings are compatible with HBase 2.0.");
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e21b7489/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
index 7bf3074..818004c 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/tool/PreUpgradeValidator.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
* <ul>
* <li>validate-cp: Validates Co-processors compatibility</li>
* <li>validate-dbe: Check Data Block Encoding for column families</li>
+ * <li>validate-hfile: Check for corrupted HFiles</li>
* </ul>
* </p>
*/
@@ -49,6 +50,7 @@ public class PreUpgradeValidator implements Tool {
public static final String TOOL_NAME = "pre-upgrade";
public static final String VALIDATE_CP_NAME = "validate-cp";
public static final String VALIDATE_DBE_NAME = "validate-dbe";
+ public static final String VALIDATE_HFILE = "validate-hfile";
private Configuration configuration;
@@ -69,6 +71,8 @@ public class PreUpgradeValidator implements Tool {
VALIDATE_CP_NAME);
System.out.printf(" %-15s Validate DataBlockEncodings are compatible with HBase%n",
VALIDATE_DBE_NAME);
+ System.out.printf(" %-15s Validate HFile contents are readable%n",
+ VALIDATE_HFILE);
System.out.println("For further information, please use command -h");
}
@@ -88,6 +92,9 @@ public class PreUpgradeValidator implements Tool {
case VALIDATE_DBE_NAME:
tool = new DataBlockEncodingValidator();
break;
+ case VALIDATE_HFILE:
+ tool = new HFileContentValidator();
+ break;
case "-h":
printUsage();
return AbstractHBaseTool.EXIT_FAILURE;