Fix HBase init error when Kerberos is enabled (#1294)

tmljob · web-flow · commit f0d1146a9406 · 2020-12-14T16:18:12.000+08:00
fix #1292
diff --git a/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java b/hugegraph-core/src/main/java/com/baidu/hugegraph/backend/tx/GraphIndexTransaction.java
@@ -86,6 +86,7 @@
 import com.baidu.hugegraph.type.define.Action;
 import com.baidu.hugegraph.type.define.HugeKeys;
 import com.baidu.hugegraph.type.define.IndexType;
+import com.baidu.hugegraph.type.define.SchemaStatus;
 import com.baidu.hugegraph.util.CollectionUtil;
 import com.baidu.hugegraph.util.E;
 import com.baidu.hugegraph.util.InsertionOrderUtil;
diff --git a/hugegraph-dist/src/assembly/static/bin/init-store.sh b/hugegraph-dist/src/assembly/static/bin/init-store.sh
@@ -22,15 +22,17 @@ ensure_path_writable $PLUGINS
 
 if [ -n "$JAVA_HOME" ]; then
     JAVA="$JAVA_HOME"/bin/java
+    EXT="$JAVA_HOME/jre/lib/ext:$LIB:$PLUGINS"
 else
     JAVA=java
+    EXT="$LIB:$PLUGINS"
 fi
 
 cd $TOP
 
 echo "Initializing HugeGraph Store..."
 
-$JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$LIB:$PLUGINS \
+$JAVA -cp $LIB/hugegraph-dist-*.jar -Djava.ext.dirs=$EXT \
       com.baidu.hugegraph.cmd.InitStore \
       "$CONF"/gremlin-server.yaml "$CONF"/rest-server.properties
 
diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseOptions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseOptions.java
@@ -114,6 +114,14 @@ public static synchronized HbaseOptions instance() {
                     "/etc/krb5.conf"
             );
 
+    public static final ConfigOption<String> HBASE_HBASE_SITE =
+            new ConfigOption<>(
+                    "hbase.hbase_site",
+                    "The HBase's configuration file",
+                    null,
+                    "/etc/hbase/conf/hbase-site.xml"
+            );
+
     public static final ConfigOption<String> HBASE_KERBEROS_PRINCIPAL =
             new ConfigOption<>(
                     "hbase.kerberos_principal",
diff --git a/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java b/hugegraph-hbase/src/main/java/com/baidu/hugegraph/backend/store/hbase/HbaseSessions.java
@@ -33,6 +33,7 @@
 import java.util.concurrent.Future;
 
 import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.hbase.Cell;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.CellUtil;
@@ -135,6 +136,9 @@ public synchronized void open() throws IOException {
         hConfig.setInt("hbase.hconnection.threads.max",
                        config.get(HbaseOptions.HBASE_THREADS_MAX));
 
+        String hbaseSite = config.get(HbaseOptions.HBASE_HBASE_SITE);
+        hConfig.addResource(new Path(hbaseSite));
+
         if(isEnableKerberos) {
             String krb5Conf = config.get(HbaseOptions.HBASE_KRB5_CONF);
             System.setProperty("java.security.krb5.conf", krb5Conf);
