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/06/04 09:05:12 UTC

[1/2] incubator-kylin git commit: minor bug fix, AbstractHadoopJob should split MR classpath by ', ' not ':'

Repository: incubator-kylin
Updated Branches:
  refs/heads/0.8.0 edfbc00c5 -> 7cd177527


minor bug fix, AbstractHadoopJob should split MR classpath by ',' not ':'


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

Branch: refs/heads/0.8.0
Commit: 077c95020fddf0edc820335a7c6e31d7ae42821b
Parents: edfbc00
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Jun 4 15:04:08 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jun 4 15:04:08 2015 +0800

----------------------------------------------------------------------
 .../main/java/org/apache/kylin/job/hadoop/AbstractHadoopJob.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/077c9502/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 60468a3..919af67 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
@@ -198,7 +198,7 @@ public abstract class AbstractHadoopJob extends Configured implements Tool {
             ShellCmdOutput output = new ShellCmdOutput();
             executor.execute("mapred classpath", output);
 
-            classpath = output.getOutput();
+            classpath = output.getOutput().trim().replace(':', ',');
         } catch (IOException e) {
             logger.error("Failed to run: 'mapred classpath'.", e);
         }


[2/2] incubator-kylin git commit: remove eBay internal CustomAgent.jar in setenv.sh

Posted by li...@apache.org.
remove eBay internal CustomAgent.jar in setenv.sh


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

Branch: refs/heads/0.8.0
Commit: 7cd177527c187a29a73f5842503eaca1a93aa3f4
Parents: 077c950
Author: Li, Yang <ya...@ebay.com>
Authored: Thu Jun 4 15:04:52 2015 +0800
Committer: Li, Yang <ya...@ebay.com>
Committed: Thu Jun 4 15:04:52 2015 +0800

----------------------------------------------------------------------
 bin/setenv.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/7cd17752/bin/setenv.sh
----------------------------------------------------------------------
diff --git a/bin/setenv.sh b/bin/setenv.sh
index 1d485c2..e80b44c 100755
--- a/bin/setenv.sh
+++ b/bin/setenv.sh
@@ -6,7 +6,7 @@ export KYLIN_JVM_SETTINGS="-Xms1024M -Xmx4096M -XX:MaxPermSize=128M"
 # export KYLIN_JVM_SETTINGS="-Xms16g -Xmx16g -XX:MaxPermSize=512m -XX:NewSize=3g -XX:MaxNewSize=3g -XX:SurvivorRatio=4 -XX:+CMSClassUnloadingEnabled -XX:+CMSParallelRemarkEnabled -XX:+UseConcMarkSweepGC -XX:+CMSIncrementalMode -XX:CMSInitiatingOccupancyFraction=70 -XX:+DisableExplicitGC"
 
 # uncomment following to for it to take effect(the values need adjusting to fit your env)
-# export KYLIN_DEBUG_SETTINGS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false -javaagent:${KYLIN_HOME}/lib/CustomAgent.jar -Dcom.ebay.lnp.rmiagent.port=8080"
+# export KYLIN_DEBUG_SETTINGS="-Dcom.sun.management.jmxremote -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false"
 
 # uncomment following to for it to take effect(the values need adjusting to fit your env)
 # export KYLIN_LD_LIBRARY_SETTINGS="-Djava.library.path=/apache/hadoop/lib/native/Linux-amd64-64"