You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2013/04/09 02:22:29 UTC
svn commit: r1465842 - in /incubator/mesos/trunk/hadoop:
hadoop-0.20.2-cdh3u3_hadoop-env.sh.patch
hadoop-0.20.205.0_hadoop-env.sh.patch
hadoop-2.0.0-mr1-cdh4.1.2_hadoop-env.sh.patch
Author: vinodkone
Date: Tue Apr 9 00:22:28 2013
New Revision: 1465842
URL: http://svn.apache.org/r1465842
Log:
Fixed Hadoop class path for the executor.
Review: https://reviews.apache.org/r/10289
Modified:
incubator/mesos/trunk/hadoop/hadoop-0.20.2-cdh3u3_hadoop-env.sh.patch
incubator/mesos/trunk/hadoop/hadoop-0.20.205.0_hadoop-env.sh.patch
incubator/mesos/trunk/hadoop/hadoop-2.0.0-mr1-cdh4.1.2_hadoop-env.sh.patch
Modified: incubator/mesos/trunk/hadoop/hadoop-0.20.2-cdh3u3_hadoop-env.sh.patch
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/hadoop/hadoop-0.20.2-cdh3u3_hadoop-env.sh.patch?rev=1465842&r1=1465841&r2=1465842&view=diff
==============================================================================
--- incubator/mesos/trunk/hadoop/hadoop-0.20.2-cdh3u3_hadoop-env.sh.patch (original)
+++ incubator/mesos/trunk/hadoop/hadoop-0.20.2-cdh3u3_hadoop-env.sh.patch Tue Apr 9 00:22:28 2013
@@ -2,12 +2,14 @@ diff --git a/conf/hadoop-env.sh b/conf/h
index ada5bef..76aaf48 100644
--- a/conf/hadoop-env.sh
+++ b/conf/hadoop-env.sh
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,9 @@
# export JAVA_HOME=/usr/lib/j2sdk1.6-sun
# Extra Java CLASSPATH elements. Optional.
-# export HADOOP_CLASSPATH="<extra_entries>:$HADOOP_CLASSPATH"
-+export HADOOP_CLASSPATH=${HADOOP_HOME}/build/contrib/mesos/classes:$HADOOP_CLASSPATH
++MESOS_CLASSPATH=${HADOOP_HOME}/build/contrib/mesos/hadoop-mesos-0.20.2-cdh3u3.jar
++MESOS_CLASSPATH=${HADOOP_HOME}/contrib/mesos/hadoop-mesos-0.20.2-cdh3u3.jar:${MESOS_CLASSPATH}
++export HADOOP_CLASSPATH=${MESOS_CLASSPATH}:${HADOOP_CLASSPATH}
# The maximum amount of heap to use, in MB. Default is 1000.
# export HADOOP_HEAPSIZE=2000
Modified: incubator/mesos/trunk/hadoop/hadoop-0.20.205.0_hadoop-env.sh.patch
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/hadoop/hadoop-0.20.205.0_hadoop-env.sh.patch?rev=1465842&r1=1465841&r2=1465842&view=diff
==============================================================================
--- incubator/mesos/trunk/hadoop/hadoop-0.20.205.0_hadoop-env.sh.patch (original)
+++ incubator/mesos/trunk/hadoop/hadoop-0.20.205.0_hadoop-env.sh.patch Tue Apr 9 00:22:28 2013
@@ -2,12 +2,14 @@ diff --git a/conf/hadoop-env.sh b/conf/h
index ada5bef..76aaf48 100644
--- a/conf/hadoop-env.sh
+++ b/conf/hadoop-env.sh
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,9 @@
# export JAVA_HOME=/usr/lib/j2sdk1.5-sun
# Extra Java CLASSPATH elements. Optional.
-# export HADOOP_CLASSPATH=
-+export HADOOP_CLASSPATH=${HADOOP_HOME}/build/contrib/mesos/classes:$HADOOP_CLASSPATH
++MESOS_CLASSPATH=${HADOOP_HOME}/build/contrib/mesos/hadoop-mesos-0.20.205.0.jar
++MESOS_CLASSPATH=${HADOOP_HOME}/share/hadoop/contrib/mesos/hadoop-mesos-0.20.205.0.jar:${MESOS_CLASSPATH}
++export HADOOP_CLASSPATH=${MESOS_CLASSPATH}:${HADOOP_CLASSPATH}
# The maximum amount of heap to use, in MB. Default is 1000.
# export HADOOP_HEAPSIZE=2000
Modified: incubator/mesos/trunk/hadoop/hadoop-2.0.0-mr1-cdh4.1.2_hadoop-env.sh.patch
URL: http://svn.apache.org/viewvc/incubator/mesos/trunk/hadoop/hadoop-2.0.0-mr1-cdh4.1.2_hadoop-env.sh.patch?rev=1465842&r1=1465841&r2=1465842&view=diff
==============================================================================
--- incubator/mesos/trunk/hadoop/hadoop-2.0.0-mr1-cdh4.1.2_hadoop-env.sh.patch (original)
+++ incubator/mesos/trunk/hadoop/hadoop-2.0.0-mr1-cdh4.1.2_hadoop-env.sh.patch Tue Apr 9 00:22:28 2013
@@ -2,12 +2,14 @@ diff --git a/conf/hadoop-env.sh b/conf/h
index ada5bef..76aaf48 100644
--- a/conf/hadoop-env.sh
+++ b/conf/hadoop-env.sh
-@@ -9,7 +9,7 @@
+@@ -9,7 +9,9 @@
# export JAVA_HOME=/usr/lib/j2sdk1.6-sun
# Extra Java CLASSPATH elements. Optional.
-# export HADOOP_CLASSPATH="<extra_entries>:$HADOOP_CLASSPATH"
-+export HADOOP_CLASSPATH=${HADOOP_HOME}/build/contrib/mesos/classes:$HADOOP_CLASSPATH
++MESOS_CLASSPATH=${HADOOP_HOME}/build/contrib/mesos/hadoop-mesos-2.0.0-mr1-cdh4.1.2.jar
++MESOS_CLASSPATH=${HADOOP_HOME}/contrib/mesos/hadoop-mesos-2.0.0-mr1-cdh4.1.2.jar:${MESOS_CLASSPATH}
++export HADOOP_CLASSPATH=${MESOS_CLASSPATH}:${HADOOP_CLASSPATH}
# The maximum amount of heap to use, in MB. Default is 1000.
# export HADOOP_HEAPSIZE=2000