Updated Branches: refs/heads/master c0e3d974f -> b826647b0
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/b826647b Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/b826647b Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/b826647b Branch: refs/heads/master Commit: b826647b0e0baf2cc4a137a20a40d35d81fc2ed4 Parents: c0e3d97 Author: Roman Shaposhnik <[email protected]> Authored: Sun Feb 10 11:57:34 2013 -0800 Committer: Roman Shaposhnik <[email protected]> Committed: Mon Feb 18 18:46:47 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/b826647b/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/b826647b/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 76cc735..a704c32 100755 --- a/bigtop-packages/src/common/hadoop/install_hadoop.sh +++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh @@ -348,7 +348,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/*
