You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by bm...@apache.org on 2011/11/09 03:53:39 UTC
svn commit: r1199601 - in
/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src:
common/hadoop/conf.pseudo/mapred-site.xml common/hadoop/install_hadoop.sh
common/hadoop/yarn.default rpm/hadoop/SPECS/hadoop.spec
Author: bmahe
Date: Wed Nov 9 02:53:38 2011
New Revision: 1199601
URL: http://svn.apache.org/viewvc?rev=1199601&view=rev
Log:
More updates for yarn
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/install_hadoop.sh
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml?rev=1199601&r1=1199600&r2=1199601&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml Wed Nov 9 02:53:38 2011
@@ -22,4 +22,10 @@
<name>mapred.job.tracker</name>
<value>localhost:8021</value>
</property>
+
+ <property>
+ <name>mapreduce.framework.name</name>
+ <value>yarn</value>
+ </property>
+
</configuration>
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=1199601&r1=1199600&r2=1199601&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 Wed Nov 9 02:53:38 2011
@@ -242,5 +242,9 @@ 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 -)
+
+ 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 -)
done
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default?rev=1199601&r1=1199600&r2=1199601&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/yarn.default Wed Nov 9 02:53:38 2011
@@ -17,4 +17,4 @@ export YARN_IDENT_STRING=yarn
export YARN_PID_DIR=/var/run/yarn
export YARN_LOG_DIR=/var/log/yarn
export YARN_CONF_DIR=/etc/yarn/conf
-export YARN_CLASSPATH="${HADOOP_CLASSPATH}:${HADOOP_PREFIX}/*:${HADOOP_PREFIX}/lib/*"
+export YARN_CLASSPATH="${YARN_CLASSPATH}:${YARN_HOME}/*:${YARN_HOME}/lib/*"
Modified: incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL: http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1199601&r1=1199600&r2=1199601&view=diff
==============================================================================
--- incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec (original)
+++ incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec Wed Nov 9 02:53:38 2011
@@ -348,6 +348,7 @@ do
done
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/default
%__cp $RPM_SOURCE_DIR/hadoop.default $RPM_BUILD_ROOT/etc/default/hadoop
+%__cp $RPM_SOURCE_DIR/yarn.default $RPM_BUILD_ROOT/etc/default/yarn
%__cp $RPM_SOURCE_DIR/hadoop-fuse.default $RPM_BUILD_ROOT/etc/default/hadoop-fuse
%__install -d -m 0755 $RPM_BUILD_ROOT/etc/security/limits.d
@@ -365,12 +366,11 @@ done
getent group hadoop >/dev/null || groupadd -r hadoop
getent group hdfs >/dev/null || groupadd -r hdfs
getent group mapred >/dev/null || groupadd -r mapred
+getent group yarn >/dev/null || groupadd -r yarn
getent passwd mapred >/dev/null || /usr/sbin/useradd --comment "Hadoop MapReduce" --shell /bin/bash -M -r -g mapred -G hadoop --home %{lib_hadoop} mapred
-
-# Create an hdfs user if one does not already exist.
getent passwd hdfs >/dev/null || /usr/sbin/useradd --comment "Hadoop HDFS" --shell /bin/bash -M -r -g hdfs -G hadoop --home %{lib_hadoop} hdfs
-
+getent passwd yarn >/dev/null || /usr/sbin/useradd --comment "Hadoop Yarn" --shell /bin/bash -M -r -g yarn -G hadoop --home %{lib_hadoop} yarn
%post
%{alternatives_cmd} --install %{config_hadoop} %{name}-conf %{etc_hadoop}/conf.empty 10
@@ -405,6 +405,7 @@ fi
%config(noreplace) %{etc_hadoop}/conf.empty
%config(noreplace) %{etc_yarn}/conf.empty
%config(noreplace) /etc/default/hadoop
+%config(noreplace) /etc/default/yarn
%config(noreplace) /etc/security/limits.d/hadoop.nofiles.conf
%{lib_hadoop}
%{libexecdir}/hadoop-config.sh