Repository: hbase Updated Branches: refs/heads/master 7d3750bd9 -> cfd4b7d56
HBASE-20683 Incorrect return value for PreUpgradeValidator Signed-off-by: Ted Yu <yuzhih...@gmail.com> Signed-off-by: Chia-Ping Tsai <chia7...@gmail.com> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/cfd4b7d5 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/cfd4b7d5 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/cfd4b7d5 Branch: refs/heads/master Commit: cfd4b7d5647b3108a595e75dac1a9aba89b697f9 Parents: 7d3750b Author: Peter Somogyi <psomo...@apache.org> Authored: Tue Jun 5 12:21:27 2018 +0200 Committer: Peter Somogyi <psomo...@apache.org> Committed: Wed Jun 6 20:03:56 2018 +0200 ---------------------------------------------------------------------- .../apache/hadoop/hbase/tool/PreUpgradeValidator.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/cfd4b7d5/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 138af6a..6fe5a92 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 @@ -56,12 +56,12 @@ public class PreUpgradeValidator extends AbstractHBaseTool { private boolean validateDBE; /** - * Check DataBlockEncodings for column families. + * Check DataBlockEncodings of column families are compatible. * - * @return DataBlockEncoding compatible with HBase 2 + * @return number of column families with incompatible DataBlockEncoding * @throws IOException if a remote or network exception occurs */ - private boolean validateDBE() throws IOException { + private int validateDBE() throws IOException { int incompatibilities = 0; LOG.info("Validating Data Block Encodings"); @@ -92,17 +92,16 @@ public class PreUpgradeValidator extends AbstractHBaseTool { + "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."); - return false; } else { LOG.info("The used Data Block Encodings are compatible with HBase 2.0."); - return true; } + return incompatibilities; } @Override protected void addOptions() { addOptNoArg("all", "Run all pre-upgrade validations"); - addOptNoArg("validateDBE", "Validate DataBlockEncoding are compatible on the cluster"); + addOptNoArg("validateDBE", "Validate DataBlockEncodings are compatible"); } @Override @@ -115,7 +114,7 @@ public class PreUpgradeValidator extends AbstractHBaseTool { protected int doWork() throws Exception { boolean validationFailed = false; if (validateDBE || validateAll) { - if (validateDBE()) { + if (validateDBE() > 0) { validationFailed = true; } }
