From 9f1bc4517ffaa21284af74bcb3853b10643963ba Mon Sep 17 00:00:00 2001 From: Peter Somogyi Date: Tue, 5 Jun 2018 12:21:27 +0200 Subject: [PATCH] HBASE-20683 Incorrect return value for PreUpgradeValidator --- .../org/apache/hadoop/hbase/tool/PreUpgradeValidator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 138af6a3f7..0922e6b660 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 @@ -102,7 +102,7 @@ public class PreUpgradeValidator extends AbstractHBaseTool { @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 +115,7 @@ public class PreUpgradeValidator extends AbstractHBaseTool { protected int doWork() throws Exception { boolean validationFailed = false; if (validateDBE || validateAll) { - if (validateDBE()) { + if (!validateDBE()) { validationFailed = true; } } -- 2.17.0