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 2011/10/23 02:30:03 UTC
svn commit: r1187834 - in
/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop:
manifests/init.pp templates/hadoop templates/mapred-site.xml
templates/taskcontroller.cfg
Author: rvs
Date: Sun Oct 23 00:30:03 2011
New Revision: 1187834
URL: http://svn.apache.org/viewvc?rev=1187834&view=rev
Log:
BIGTOP-143. need to update hadoop manifest to the state of packages
Added:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
Modified:
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg
Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp?rev=1187834&r1=1187833&r2=1187834&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/manifests/init.pp Sun Oct 23 00:30:03 2011
@@ -40,6 +40,11 @@ class hadoop {
content => template('hadoop/hadoop-env.sh'),
}
+ file {
+ "/etc/default/hadoop":
+ content => template('hadoop/hadoop'),
+ }
+
package { "hadoop":
ensure => latest,
}
Added: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop?rev=1187834&view=auto
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop (added)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/hadoop Sun Oct 23 00:30:03 2011
@@ -0,0 +1,8 @@
+export HADOOP_HOME=/usr/lib/hadoop
+export HADOOP_NAMENODE_USER=hdfs
+export HADOOP_SECONDARYNAMENODE_USER=hdfs
+export HADOOP_DATANODE_USER=hdfs
+export HADOOP_JOBTRACKER_USER=mapred
+export HADOOP_TASKTRACKER_USER=mapred
+export HADOOP_IDENT_STRING=hadoop
+export JAVA_HOME=/usr/java/latest
Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml?rev=1187834&r1=1187833&r2=1187834&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/mapred-site.xml Sun Oct 23 00:30:03 2011
@@ -130,7 +130,7 @@
<property>
<!-- set this to ~1.5x the heap size in mapred.child.java.opts -->
<name>mapred.child.ulimit</name>
- <value>1572864</value> <!-- 1.5 GB in KB -->
+ <value>unlimited</value>
</property>
<% end %>
Modified: incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg
URL: http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg?rev=1187834&r1=1187833&r2=1187834&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg (original)
+++ incubator/bigtop/trunk/bigtop-deploy/puppet/modules/hadoop/templates/taskcontroller.cfg Sun Oct 23 00:30:03 2011
@@ -1,3 +1,5 @@
mapred.local.dir=<% hadoop_storage_locations.split(";").each do |storage_location| %><%= storage_location%>/scratch,<% end %>
-hadoop.log.dir=/var/log/hadoop-0.20/
+hadoop.log.dir=/var/log/hadoop/
mapreduce.tasktracker.group=mapred
+min.user.id=0
+banned.users=foo