You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@bigtop.apache.org by rv...@apache.org on 2013/02/10 21:09:58 UTC
[2/3] git commit: BIGTOP-841. hadoop-conf-pseudo missed configuration
for capacity scheduler and historyserver
BIGTOP-841. hadoop-conf-pseudo missed configuration for capacity scheduler and historyserver
Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/80bf8fc6
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/80bf8fc6
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/80bf8fc6
Branch: refs/heads/RCs
Commit: 80bf8fc6ab26d25f60b7855e5428768afe867e62
Parents: 77d25e4
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Sun Feb 10 11:57:34 2013 -0800
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Sun Feb 10 11:58:49 2013 -0800
----------------------------------------------------------------------
.../src/common/hadoop/conf.pseudo/mapred-site.xml | 9 +++++++++
.../src/common/hadoop/install_hadoop.sh | 4 +++-
2 files changed, 12 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/bigtop/blob/80bf8fc6/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml b/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
index ff3b4e2..93b5c38 100644
--- a/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
+++ b/bigtop-packages/src/common/hadoop/conf.pseudo/mapred-site.xml
@@ -29,6 +29,15 @@
</property>
<property>
+ <name>mapreduce.jobhistory.address</name>
+ <value>localhost:10020</value>
+ </property>
+ <property>
+ <name>mapreduce.jobhistory.webapp.address</name>
+ <value>localhost:19888</value>
+ </property>
+
+ <property>
<description>To set the value of tmp directory for map and reduce tasks.</description>
<name>mapreduce.task.tmp.dir</name>
<value>/var/lib/hadoop-mapreduce/cache/${user.name}/tasks</value>
http://git-wip-us.apache.org/repos/asf/bigtop/blob/80bf8fc6/bigtop-packages/src/common/hadoop/install_hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh b/bigtop-packages/src/common/hadoop/install_hadoop.sh
index 2f3714d..c8185e0 100755
--- a/bigtop-packages/src/common/hadoop/install_hadoop.sh
+++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh
@@ -347,7 +347,9 @@ sed -i -e '/<\/configuration>/i\
for conf in conf.pseudo ; do
install -d -m 0755 $HADOOP_ETC_DIR/$conf
# Install the upstream config files
- cp ${BUILD_DIR}/etc/hadoop/*metrics* $HADOOP_ETC_DIR/$conf
+ cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/$conf
+ # Remove the ones that shouldn't be installed
+ rm -rf $HADOOP_ETC_DIR/$conf/httpfs*
# Overlay the -site files
(cd $DISTRO_DIR/$conf && tar -cf - .) | (cd $HADOOP_ETC_DIR/$conf && tar -xf -)
chmod -R 0644 $HADOOP_ETC_DIR/$conf/*