[hbase-operator-tools] branch master updated: HBASE-21378 [hbck2] checkHBCKSupport blocks assigning hbase:meta or hbase:namespace when master is not initialized

[stack]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 458152d  HBASE-21378 [hbck2] checkHBCKSupport blocks assigning 
hbase:meta or hbase:namespace when master is not initialized
458152d is described below

commit 458152d97000671ed686c94e0e57dbcf91f6aad1
Author: tianjingyun <tianjy1...@gmail.com>
AuthorDate: Sat Oct 27 13:33:40 2018 +0800

    HBASE-21378 [hbck2] checkHBCKSupport blocks assigning hbase:meta or 
hbase:namespace when master is not initialized
---
 hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 35df153..49e9c64 100644
--- a/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java
+++ b/hbase-hbck2/src/main/java/org/apache/hbase/HBCK2.java
@@ -80,6 +80,7 @@ public class HBCK2 extends Configured implements Tool {
   private Configuration conf;
   private static final String TWO_POINT_ONE = "2.1.0";
   private static final String MININUM_VERSION = "2.0.3";
+  private boolean skipCheck = false;
   /**
    * Wait 1ms on lock by default.
    */
@@ -89,6 +90,10 @@ public class HBCK2 extends Configured implements Tool {
    * Check for HBCK support.
    */
   void checkHBCKSupport(Connection connection) throws IOException {
+    if(skipCheck){
+      LOG.info("hbck support check skipped");
+      return;
+    }
     try (Admin admin = connection.getAdmin()) {
       
checkVersion(admin.getClusterMetrics(EnumSet.of(ClusterMetrics.Option.HBASE_VERSION)).
           getHBaseVersion());
@@ -314,6 +319,8 @@ public class HBCK2 extends Configured implements Tool {
     options.addOption(peerPort);
     Option version = Option.builder("v").longOpt(VERSION).desc("this hbck2 
version").build();
     options.addOption(version);
+    Option skip = Option.builder("s").longOpt("skip").desc("skip hbase version 
check").build();
+    options.addOption(skip);
 
     // Parse command-line.
     CommandLineParser parser = new DefaultParser();
@@ -349,6 +356,9 @@ public class HBCK2 extends Configured implements Tool {
     if (commandLine.hasOption(parent.getOpt())) {
       getConf().set(HConstants.ZOOKEEPER_ZNODE_PARENT, 
commandLine.getOptionValue(parent.getOpt()));
     }
+    if(commandLine.hasOption(skip.getOpt())){
+      skipCheck = true;
+    }
 
     // Now process commands.
     String[] commands = commandLine.getArgs();