You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/11/16 12:04:27 UTC
[hbase-operator-tools] branch master updated (458152d -> b658552)
This is an automated email from the ASF dual-hosted git repository.
busbey pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hbase-operator-tools.git.
from 458152d HBASE-21378 [hbck2] checkHBCKSupport blocks assigning hbase:meta or hbase:namespace when master is not initialized
new 8d0ec80 HBASE-21483 [hbck2] version string checking should look for exactly the version we know doesn't work
new b658552 HBASE-21484 [hbck2] hbck2 should default to a released hbase version
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java | 7 ++++---
hbase-hbck2/src/test/java/org/apache/hbase/TestHBCK2.java | 5 +++++
pom.xml | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
[hbase-operator-tools] 02/02: HBASE-21484 [hbck2] hbck2 should
default to a released hbase version
Posted by 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 b658552b443613320dac84f6b782e6143bba508e
Author: Sean Busbey <bu...@cloudera.com>
AuthorDate: Thu Nov 15 16:47:32 2018 -0600
HBASE-21484 [hbck2] hbck2 should default to a released hbase version
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index f241901..e975217 100644
--- a/pom.xml
+++ b/pom.xml
@@ -123,7 +123,7 @@
<compileSource>1.8</compileSource>
<java.min.version>${compileSource}</java.min.version>
<maven.min.version>3.3.3</maven.min.version>
- <hbase.version>2.1.1-SNAPSHOT</hbase.version>
+ <hbase.version>2.1.1</hbase.version>
<maven.compiler.version>3.6.1</maven.compiler.version>
<surefire.version>2.21.0</surefire.version>
<surefire.provider>surefire-junit47</surefire.provider>
[hbase-operator-tools] 01/02: HBASE-21483 [hbck2] version string
checking should look for exactly the version we know doesn't work
Posted by 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");
}