git commit: WHIRR-696. Whirr script for Hadoop MRv2 YARN installs that supports Hadoop-2.0.x and Hadoop 3.x (trunk) branches. Contributed by Eli Reisman.

[to...@apache.org]

Updated Branches:
  refs/heads/trunk ad40bd74b -> ef1cb094f


WHIRR-696. Whirr script for Hadoop MRv2 YARN installs that supports Hadoop-2.0.x and Hadoop 3.x (trunk) branches. Contributed by Eli Reisman.


Project: http://git-wip-us.apache.org/repos/asf/whirr/repo
Commit: http://git-wip-us.apache.org/repos/asf/whirr/commit/ef1cb094
Tree: http://git-wip-us.apache.org/repos/asf/whirr/tree/ef1cb094
Diff: http://git-wip-us.apache.org/repos/asf/whirr/diff/ef1cb094

Branch: refs/heads/trunk
Commit: ef1cb094f8cd518aac2427aa5325f010c42f9962
Parents: ad40bd7
Author: Tom White <to...@cloudera.com>
Authored: Wed Feb 6 11:11:58 2013 +0000
Committer: Tom White <to...@cloudera.com>
Committed: Wed Feb 6 11:12:18 2013 +0000

----------------------------------------------------------------------
 CHANGES.txt                        |    5 +++++
 recipes/hadoop-yarn-ec2.properties |   29 ++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/whirr/blob/ef1cb094/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2a4441d..65dab4d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -21,9 +21,14 @@ Release 0.8.2 (unreleased changes)
     
     WHIRR-673. Upgrade CDH Repos for RHEL/CentOS 6. (Graham Gear via tomwhite)
 
+  BUG FIXES
+
     WHIRR-699. Fix indentation and formatting on "Getting Started" page.
     (Mark Grover via tomwhite)
 
+    WHIRR-696. Whirr script for Hadoop MRv2 YARN installs that supports
+    Hadoop-2.0.x and Hadoop 3.x (trunk) branches. (Eli Reisman via tomwhite)
+
 Release 0.8.1 - 2012-10-19
 
   NEW FEATURES

http://git-wip-us.apache.org/repos/asf/whirr/blob/ef1cb094/recipes/hadoop-yarn-ec2.properties
----------------------------------------------------------------------
diff --git a/recipes/hadoop-yarn-ec2.properties b/recipes/hadoop-yarn-ec2.properties
index 3802381..c29b6b8 100644
--- a/recipes/hadoop-yarn-ec2.properties
+++ b/recipes/hadoop-yarn-ec2.properties
@@ -25,6 +25,10 @@
 # Change the cluster name here
 whirr.cluster-name=hadoop-yarn
 
+# Expert: specify the version of Hadoop to install.
+whirr.hadoop.version=0.23.5
+whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
+
 # Change the number of machines in the cluster here
 whirr.instance-templates=1 hadoop-namenode+yarn-resourcemanager+mapreduce-historyserver,1 hadoop-datanode+yarn-nodemanager
 
@@ -46,7 +50,10 @@ whirr.hardware-id=m1.large
 # Ubuntu 10.04 LTS Lucid. See http://alestic.com/
 #whirr.image-id=us-east-1/ami-da0cf8b3
 # If you choose a different location, make sure whirr.image-id is updated too
-#whirr.location-id=us-east-1
+whirr.location-id=us-east-1
+
+# 64 bit required, and either Ubuntu 10.04 or CentOS/RHEL 5.x. 
+whirr.template=osFamily=UBUNTU,osVersionMatches=10.04,os64Bit=true,minRam=2048
 
 # You can also specify the spot instance price
 # http://aws.amazon.com/ec2/spot-instances/
@@ -62,10 +69,22 @@ whirr.hardware-id=m1.large
 # example, setting 
 # hadoop-common.fs.trash.interval=1440
 # will result in fs.trash.interval being set to 1440 in core-site.xml.
-
+hadoop-yarn.yarn.nodemanager.log-dirs=/tmp/nm-logs
+hadoop-yarn.yarn.nodemanager.remote-app-log-dir=/tmp/nm-remote-app-logs
+hadoop-yarn.yarn.nodemanager.aux-services=mapreduce.shuffle
+hadoop-yarn.yarn.nodemanager.aux-services.mapreduce.shuffle.class=org.apache.hadoop.mapred.ShuffleHandler
+hadoop-yarn.yarn.nodemanager.delete.debug-delay-sec=6000
+hadoop-yarn.yarn.app.mapreduce.am.staging-dir=/user
 hadoop-mapreduce.mapreduce.framework.name=yarn
 hadoop-common.ipc.client.connect.max.retries=100
 
-# Expert: specify the version of Hadoop to install.
-whirr.hadoop.version=0.23.1
-whirr.hadoop.tarball.url=http://apache.osuosl.org/hadoop/common/hadoop-${whirr.hadoop.version}/hadoop-${whirr.hadoop.version}.tar.gz
\ No newline at end of file
+# Hadoop environment var overrides
+hadoop-env.JAVA_HOME=/usr/lib/jvm/java-6-openjdk
+yarn-env.YARN_CONF_DIR=/usr/local/hadoop-\${whirr.hadoop.version}/etc/hadoop
+
+# Must be set for Hadoop-2.0.x or trunk to run MRv2 on YARN
+hadoop-common.hadoop.tmp.dir=/data/tmp/hadoop-\${user.name}
+hadoop-yarn.yarn.nodemanager.local-dirs=/data/tmp/hadoop-\${user.name}
+# Set this to the max you want to allocate per compute node
+hadoop-yarn.yarn.nodemanager.resource.memory-mb=4096
+