You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2015/02/27 07:25:36 UTC

[23/41] incubator-kylin git commit: minor, yarn app classpath shall be ', ' separated, though ':' seems to work as well

minor, yarn app classpath shall be ',' separated, though ':' seems to work as well


Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/752187b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/752187b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/752187b9

Branch: refs/heads/inverted-index
Commit: 752187b93509aa9e8d5222a5f21ecb11b4b4aa09
Parents: a5daec6
Author: Li, Yang <ya...@ebay.com>
Authored: Fri Feb 13 13:50:01 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Fri Feb 13 13:50:01 2015 +0800

----------------------------------------------------------------------
 .../java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/752187b9/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
----------------------------------------------------------------------
diff --git a/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java b/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
index 84344ad..4d6d8d4 100644
--- a/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
+++ b/job/src/main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java
@@ -121,11 +121,14 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
         String kylinHiveDependency = System.getProperty("kylin.hive.dependency");
         logger.info("append kylin.hive.dependency: " + kylinHiveDependency + " to " + MAP_REDUCE_CLASSPATH);
         if (kylinHiveDependency != null) {
-            final String classpath = job.getConfiguration().get(MAP_REDUCE_CLASSPATH);
+            // yarn classpath is comma separated
+            kylinHiveDependency = kylinHiveDependency.replace(":", ",");
+            Configuration jobConf = job.getConfiguration();
+            final String classpath = jobConf.get(MAP_REDUCE_CLASSPATH);
             if (classpath == null) {
-                job.getConfiguration().set(MAP_REDUCE_CLASSPATH, kylinHiveDependency);
+                jobConf.set(MAP_REDUCE_CLASSPATH, kylinHiveDependency);
             } else {
-                job.getConfiguration().set(MAP_REDUCE_CLASSPATH, classpath + ":" + kylinHiveDependency);
+                jobConf.set(MAP_REDUCE_CLASSPATH, classpath + "," + kylinHiveDependency);
             }
         }
         if (isAsync) {