[kylin] branch 2.4.x updated: KYLIN-3438 mapreduce.job.queuename does not work at 'Convert Cuboid Data to HFile' Step

[shaofengshi]

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

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


The following commit(s) were added to refs/heads/2.4.x by this push:
     new 273f7cc  KYLIN-3438 mapreduce.job.queuename does not work at 'Convert 
Cuboid Data to HFile' Step
273f7cc is described below

commit 273f7cc2990a48ccc888029635a90a30a095062b
Author: wyj <wuying...@cmss.chinamobile.com>
AuthorDate: Sun Jul 15 00:40:11 2018 -0700

    KYLIN-3438 mapreduce.job.queuename does not work at 'Convert Cuboid Data to 
HFile' Step
    
    Signed-off-by: shaofengshi <shaofeng...@apache.org>
---
 .../main/java/org/apache/kylin/storage/hbase/steps/CubeHFileJob.java   | 3 +++
 1 file changed, 3 insertions(+)

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 ce4ceac..5ffdd48 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
@@ -46,6 +46,8 @@ import org.apache.kylin.storage.hbase.HBaseConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import static org.apache.hadoop.hbase.HBaseConfiguration.merge;
+
 /**
  * @author George Song (ysong1)
  */
@@ -76,6 +78,7 @@ public class CubeHFileJob extends AbstractHadoopJob {
 
             // use current hbase configuration
             Configuration configuration = 
HBaseConnection.getCurrentHBaseConfiguration();
+            merge(configuration, getConf());
             job = Job.getInstance(configuration, 
getOptionValue(OPTION_JOB_NAME));
 
             setJobClasspath(job, cube.getConfig());