Author: rvs
Date: Thu Mar 22 18:03:05 2012
New Revision: 1303938
URL: http://svn.apache.org/viewvc?rev=1303938&view=rev
Log:
BIGTOP-480. log aggregation knob is now yarn.log-aggregation-enable and needs
to be enabled
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-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/mapreduce.default
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml?rev=1303938&r1=1303937&r2=1303938&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-deploy/puppet/modules/hadoop/templates/yarn-site.xml
Thu Mar 22 18:03:05 2012
@@ -100,6 +100,11 @@
</property>
<property>
+ <name>yarn.log-aggregation-enable</name>
+ <value>true</value>
+ </property>
+
+ <property>
<name>yarn.nodemanager.local-dirs</name>
<value><%= yarn_data_dirs.join(",") %></value>
<final>true</final>
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml?rev=1303938&r1=1303937&r2=1303938&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.empty/yarn-site.xml
Thu Mar 22 18:03:05 2012
@@ -29,6 +29,11 @@
</property>
<property>
+ <name>yarn.log-aggregation-enable</name>
+ <value>true</value>
+ </property>
+
+ <property>
<description>List of directories to store localized files in.</description>
<name>yarn.nodemanager.local-dirs</name>
<value>/var/lib/hadoop-yarn/cache/${user.name}/nm-local-dir</value>
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml?rev=1303938&r1=1303937&r2=1303938&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/conf.pseudo/yarn-site.xml
Thu Mar 22 18:03:05 2012
@@ -29,6 +29,11 @@
</property>
<property>
+ <name>yarn.log-aggregation-enable</name>
+ <value>true</value>
+ </property>
+
+ <property>
<description>List of directories to store localized files in.</description>
<name>yarn.nodemanager.local-dirs</name>
<value>/var/lib/hadoop-yarn/cache/${user.name}/nm-local-dir</value>
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=1303938&r1=1303937&r2=1303938&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
Thu Mar 22 18:03:05 2012
@@ -177,7 +177,7 @@ elif [ -e /usr/lib/bigtop-utils/bigtop-d
. /usr/lib/bigtop-utils/bigtop-detect-javahome
fi
-export HADOOP_LIBEXEC_DIR=${SYSTEM_LIBEXEC_DIR#${PREFIX}}
+export HADOOP_LIBEXEC_DIR=/${SYSTEM_LIBEXEC_DIR#${PREFIX}}
exec ${component#${PREFIX}} "\$@"
EOF
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default?rev=1303938&r1=1303937&r2=1303938&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/mapreduce.default
Thu Mar 22 18:03:05 2012
@@ -14,7 +14,7 @@
# limitations under the License.
# FIXME: MAPREDUCE-3900
-export YARN_IDENT_STRING=mapreduce
+export YARN_IDENT_STRING=mapred
export YARN_PID_DIR=/var/run/hadoop-mapreduce
export YARN_LOG_DIR=/var/log/hadoop-mapreduce
export HADOOP_LOG_DIR=/var/log/hadoop-mapreduce
