[hbase-operator-tools] 01/02: HBASE-21483 [hbck2] version string checking should look for exactly the version we know doesn't work

[bu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

busbey pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git

commit 8d0ec805cb32dfb99dfa8eb8a931f950f7097a88
Author: Sean Busbey <bu...@cloudera.com>
AuthorDate: Thu Nov 15 16:45:13 2018 -0600

    HBASE-21483 [hbck2] version string checking should look for exactly the version we know doesn't work
---
 hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java     | 7 ++++---
 hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java | 5 +++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java b/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java
index 49e9c64..e9089e8 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java
@@ -101,12 +101,13 @@ public class HBCK2 extends Configured implements Tool {
   }
 
   static void checkVersion(final String versionStr) {
-    if (versionStr.startsWith(TWO_POINT_ONE)) {
-      throw new UnsupportedOperationException(TWO_POINT_ONE + " has no support for hbck2");
-    }
     if (VersionInfo.compareVersion(MININUM_VERSION, versionStr) > 0) {
       throw new UnsupportedOperationException("Requires " + MININUM_VERSION + " at least.");
     }
+    // except 2.1.0 didn't ship with support
+    if (VersionInfo.compareVersion(TWO_POINT_ONE, versionStr) == 0) {
+      throw new UnsupportedOperationException(TWO_POINT_ONE + " has no support for hbck2");
+    }
   }
 
   TableState setTableState(TableName tableName, TableState.State state) throws IOException {
diff --git a/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java b/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java
index 1b54687..e902275 100644
--- a/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java
+++ b/hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java
@@ -70,6 +70,11 @@ public class TestHBCK2 {
   }
 
   @Test
+  public void testCheckVersionSpecial210() {
+    HBCK2.checkVersion("2.1.0-patchedForHBCK2");
+  }
+
+  @Test
   public void testCheckVersion203() {
     HBCK2.checkVersion("2.0.3");
   }