You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by to...@apache.org on 2010/10/04 06:30:14 UTC
svn commit: r1004106 - in /incubator/whirr/trunk: CHANGES.txt
scripts/apache/hadoop/install scripts/cloudera/cdh/install
services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopService.java
Author: tomwhite
Date: Mon Oct 4 04:30:13 2010
New Revision: 1004106
URL: http://svn.apache.org/viewvc?rev=1004106&view=rev
Log:
WHIRR-101. Hadoop on EC2 does not use the /mnt partition.
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/scripts/apache/hadoop/install
incubator/whirr/trunk/scripts/cloudera/cdh/install
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopService.java
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1004106&r1=1004105&r2=1004106&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Oct 4 04:30:13 2010
@@ -34,6 +34,8 @@ Trunk (unreleased changes)
WHIRR-108. Fix checkstyle and rat violations. (tomwhite)
+ WHIRR-101. Hadoop on EC2 does not use the /mnt partition. (tomwhite)
+
Release 0.1.0 - 2010-09-02
INCOMPATIBLE CHANGES
Modified: incubator/whirr/trunk/scripts/apache/hadoop/install
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/hadoop/install?rev=1004106&r1=1004105&r2=1004106&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/hadoop/install (original)
+++ incubator/whirr/trunk/scripts/apache/hadoop/install Mon Oct 4 04:30:13 2010
@@ -147,8 +147,14 @@ function make_hadoop_dirs {
# Configure Hadoop by setting up disks and site file
function configure_hadoop() {
-
- MOUNT=/data
+ case $CLOUD_PROVIDER in
+ ec2)
+ MOUNT=/mnt
+ ;;
+ *)
+ MOUNT=/data
+ ;;
+ esac
FIRST_MOUNT=$MOUNT
DFS_NAME_DIR=$MOUNT/hadoop/hdfs/name
FS_CHECKPOINT_DIR=$MOUNT/hadoop/hdfs/secondary
Modified: incubator/whirr/trunk/scripts/cloudera/cdh/install
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/cloudera/cdh/install?rev=1004106&r1=1004105&r2=1004106&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/cloudera/cdh/install (original)
+++ incubator/whirr/trunk/scripts/cloudera/cdh/install Mon Oct 4 04:30:13 2010
@@ -144,8 +144,14 @@ function make_hadoop_dirs {
# Configure Hadoop by setting up disks and site file
function configure_hadoop() {
-
- MOUNT=/data
+ case $CLOUD_PROVIDER in
+ ec2)
+ MOUNT=/mnt
+ ;;
+ *)
+ MOUNT=/data
+ ;;
+ esac
FIRST_MOUNT=$MOUNT
DFS_NAME_DIR=$MOUNT/hadoop/hdfs/name
FS_CHECKPOINT_DIR=$MOUNT/hadoop/hdfs/secondary
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopService.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopService.java?rev=1004106&r1=1004105&r2=1004106&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopService.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopService.java Mon Oct 4 04:30:13 2010
@@ -131,10 +131,11 @@ public class HadoopService extends Servi
// Launch slaves (DN and TT)
Payload slaveBootScript = newStringPayload(runUrls(clusterSpec.getRunUrlBase(),
"sun/java/install",
- String.format("%s dn,tt -n %s -j %s",
+ String.format("%s dn,tt -n %s -j %s -c %s",
hadoopInstallRunUrl,
namenodePublicAddress.getHostName(),
- jobtrackerPublicAddress.getHostName())));
+ jobtrackerPublicAddress.getHostName(),
+ clusterSpec.getProvider())));
TemplateBuilder slaveTemplateBuilder = computeService.templateBuilder()
.options(runScript(slaveBootScript)