Author: bmahe
Date: Fri Nov 18 23:57:10 2011
New Revision: 1203904
URL: http://svn.apache.org/viewvc?rev=1203904&view=rev
Log:
BIGTOP-266. Need to override default yarn task classpath
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mrapp-generated-classpath
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh?rev=1203904&r1=1203903&r2=1203904&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
Fri Nov 18 23:57:10 2011
@@ -222,6 +222,8 @@ install -d -m 0755 $YARN_ETC_DIR/conf.em
cp ${BUILD_DIR}/conf/* $YARN_ETC_DIR/conf.empty
cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/conf.empty
+cp $DISTRO_DIR/mrapp-generated-classpath $HADOOP_ETC_DIR/conf.empty
+cp $DISTRO_DIR/mrapp-generated-classpath $YARN_ETC_DIR/conf.empty
# docs
install -d -m 0755 ${DOC_DIR}
@@ -252,10 +254,12 @@ for conf in conf.pseudo ; do
install -d -m 0755 $HADOOP_ETC_DIR/$conf
# Overlay the -site files
(cd $DISTRO_DIR/$conf && tar -cf - .) | (cd $HADOOP_ETC_DIR/$conf && tar -xf
-)
+ cp $DISTRO_DIR/mrapp-generated-classpath $HADOOP_ETC_DIR/$conf
install -d -m 0755 $YARN_ETC_DIR/$conf
# Overlay the -site files
(cd $DISTRO_DIR/$conf.yarn && tar -cf - .) | (cd $YARN_ETC_DIR/$conf && tar
-xf -)
+ cp $DISTRO_DIR/mrapp-generated-classpath $YARN_ETC_DIR/$conf
done
cp ${BUILD_DIR}/etc/hadoop/log4j.properties $HADOOP_ETC_DIR/conf.pseudo
Added:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mrapp-generated-classpath
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mrapp-generated-classpath?rev=1203904&view=auto
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mrapp-generated-classpath
(added)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mrapp-generated-classpath
Fri Nov 18 23:57:10 2011
@@ -0,0 +1 @@
+/usr/lib/hadoop/*:/usr/lib/hadoop/lib/*
