From efd904813baa4b489665647899195395446fed32 Mon Sep 17 00:00:00 2001
From: shenhua <shenhua@ubuntu.(none)>
Date: Wed, 7 Nov 2018 21:40:52 -0800
Subject: [PATCH] update hbase hdfs ha

---
 storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java           |   1 +
 storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java         |   4 ++--
 storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java        |   4 ++--
 storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java |   3 ++-

diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
index 0c2fb04..fa219c4 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/HBaseConnection.java
@@ -226,6 +226,7 @@ public class HBaseConnection {
             }
         }
         conf.setStrings(DFSConfigKeys.DFS_NAMESERVICES, mainNameServices.toArray(new String[0]));
+
         // See YARN-3021, instruct RM skip renew token of hbase cluster name services
         conf.setStrings(JOB_NAMENODES_TOKEN_RENEWAL_EXCLUDE, nameServices.toArray(new String[0]));
     }
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
index f0b77aa..fc6d37b 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/BulkLoadJob.java
@@ -23,7 +23,7 @@ import java.io.IOException;
 import org.apache.commons.cli.Options;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FsShell;
-import org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles;
+import org.apache.hadoop.hbase.mapreduce.KylinLoadIncrementalHFiles;
 import org.apache.hadoop.util.ToolRunner;
 import org.apache.kylin.engine.mr.MRUtil;
 import org.apache.kylin.engine.mr.common.AbstractHadoopJob;
@@ -75,7 +75,7 @@ public class BulkLoadJob extends AbstractHadoopJob {
         newArgs[1] = tableName;
 
         logger.debug("Start to run LoadIncrementalHFiles");
-        int ret = MRUtil.runMRJob(new LoadIncrementalHFiles(conf), newArgs);
+        int ret = MRUtil.runMRJob(new KylinLoadIncrementalHFiles(conf), newArgs);
         logger.debug("End to run LoadIncrementalHFiles");
         return ret;
     }
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
index 8bfc27e..6890a87 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java
@@ -65,10 +65,10 @@ public class CubeHFileJob extends AbstractHadoopJob {
             options.addOption(OPTION_OUTPUT_PATH);
             options.addOption(OPTION_HTABLE_NAME);
             parseOptions(options, args);
-
+//            Path partitionFilePath = new Path(getOptionValue(OPTION_PARTITION_FILE_PATH).replace("ns", "ns2"));
             Path partitionFilePath = new Path(getOptionValue(OPTION_PARTITION_FILE_PATH));
-
             Path output = new Path(getOptionValue(OPTION_OUTPUT_PATH));
+//            Path output = new Path(getOptionValue(OPTION_OUTPUT_PATH).replace("ns", "ns2"));
             String cubeName = getOptionValue(OPTION_CUBE_NAME);
 
             CubeManager cubeMgr = CubeManager.getInstance(KylinConfig.getInstanceFromEnv());
diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java
index 366e8cc..bc34c3b 100644
--- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java
+++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java
@@ -274,7 +274,8 @@ public class DeployCoprocessorCLI {
 
     public static void addCoprocessorOnHTable(HTableDescriptor desc, Path hdfsCoprocessorJar) throws IOException {
         logger.info("Add coprocessor on " + desc.getNameAsString());
-        desc.addCoprocessor(CubeEndpointClass, hdfsCoprocessorJar, 1001, null);
+//        desc.addCoprocessor(CubeEndpointClass, hdfsCoprocessorJar, 1001, null);
+        desc.addCoprocessor(CubeEndpointClass, new Path(hdfsCoprocessorJar.toUri().getPath()), 1001, null);
     }
 
     public static boolean resetCoprocessor(String tableName, Admin hbaseAdmin, Path hdfsCoprocessorJar) throws IOException {
--
libgit2 0.24.0