[kylin] branch 2.5.x updated: KYLIN-3607 add hbase-hadoop*-compat*.jar

[sh...@apache.org]

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

shaofengshi pushed a commit to branch 2.5.x
in repository https://gitbox.apache.org/repos/asf/kylin.git


The following commit(s) were added to refs/heads/2.5.x by this push:
     new 4b65975  KYLIN-3607 add hbase-hadoop*-compat*.jar
4b65975 is described below

commit 4b65975a2c007bd7b87f0b4b90e9136d5070fb7b
Author: Lijun Cao <64...@qq.com>
AuthorDate: Fri Dec 14 17:56:14 2018 +0800

    KYLIN-3607 add hbase-hadoop*-compat*.jar
---
 .../java/org/apache/kylin/storage/hbase/steps/HBaseSparkSteps.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseSparkSteps.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseSparkSteps.java
index ccab22f..86ad0fb 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseSparkSteps.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/HBaseSparkSteps.java
@@ -66,6 +66,11 @@ public class HBaseSparkSteps extends HBaseJobSteps {
         StringUtil.appendWithSeparator(jars, ClassUtil.findContainingJar("org.apache.htrace.Trace", null)); // htrace-core.jar
         StringUtil.appendWithSeparator(jars,
                 ClassUtil.findContainingJar("com.yammer.metrics.core.MetricsRegistry", null)); // metrics-core.jar
+        //KYLIN-3607
+        StringUtil.appendWithSeparator(jars,
+                ClassUtil.findContainingJar("org.apache.hadoop.hbase.regionserver.MetricsRegionServerSourceFactory", null));//hbase-hadoop-compat-1.1.1.jar
+        StringUtil.appendWithSeparator(jars,
+                ClassUtil.findContainingJar("org.apache.hadoop.hbase.regionserver.MetricsRegionServerSourceFactoryImpl", null));//hbase-hadoop2-compat-1.1.1.jar
 
         StringUtil.appendWithSeparator(jars, seg.getConfig().getSparkAdditionalJars());
         sparkExecutable.setJars(jars.toString());