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 2011/01/31 06:36:19 UTC
svn commit: r1065482 - in /incubator/whirr/trunk: ./
core/src/main/java/org/apache/whirr/service/
core/src/test/java/org/apache/whirr/service/ recipes/
scripts/apache/hadoop/ scripts/cloudera/cdh/
services/cdh/src/test/resources/ services/hadoop/src/ma...
Author: tomwhite
Date: Mon Jan 31 05:36:18 2011
New Revision: 1065482
URL: http://svn.apache.org/viewvc?rev=1065482&view=rev
Log:
WHIRR-199. Add aliases for short role names like nn, jt, tt, dn, zk. Contributed by asuvu.
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java
incubator/whirr/trunk/core/src/test/java/org/apache/whirr/service/ClusterSpecTest.java
incubator/whirr/trunk/recipes/hadoop-ec2.properties
incubator/whirr/trunk/recipes/hadoop-rackspace.properties
incubator/whirr/trunk/recipes/hbase-ec2.properties
incubator/whirr/trunk/recipes/zookeeper-ec2.properties
incubator/whirr/trunk/scripts/apache/hadoop/post-configure
incubator/whirr/trunk/scripts/cloudera/cdh/post-configure
incubator/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopDataNodeClusterActionHandler.java
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopJobTrackerClusterActionHandler.java
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTaskTrackerClusterActionHandler.java
incubator/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties
incubator/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties
incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
incubator/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Jan 31 05:36:18 2011
@@ -16,6 +16,9 @@ Trunk (unreleased changes)
WHIRR-195. Display available roles instead of service names
when running ./bin/whirr (asavu)
+ WHIRR-199. Add aliases for short role names like nn, jt, tt, dn, zk.
+ (asavu via tomwhite)
+
BUG FIXES
WHIRR-170. Instances should be started in the order specified in
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java Mon Jan 31 05:36:18 2011
@@ -18,13 +18,6 @@
package org.apache.whirr.service;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.whirr.ssh.KeyPair.sameKeyPair;
-import static org.jclouds.io.Payloads.newFilePayload;
-import static org.jclouds.io.Payloads.newStringPayload;
-import static org.jclouds.util.Utils.toStringAndClose;
-
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
@@ -32,26 +25,36 @@ import com.google.common.collect.Sets;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
import com.jcraft.jsch.KeyPair;
+import org.apache.commons.configuration.CompositeConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.text.StrLookup;
+import org.jclouds.io.Payload;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.configuration.CompositeConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.ConfigurationException;
-import org.apache.commons.configuration.PropertiesConfiguration;
-import org.apache.commons.configuration.interpol.ConfigurationInterpolator;
-import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.text.StrLookup;
-import org.jclouds.io.Payload;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.whirr.ssh.KeyPair.sameKeyPair;
+import static org.jclouds.io.Payloads.newFilePayload;
+import static org.jclouds.io.Payloads.newStringPayload;
+import static org.jclouds.util.Utils.toStringAndClose;
+
/**
* This class represents the specification of a cluster. It is used to describe
@@ -76,10 +79,8 @@ public class ClusterSpec {
"service to use. E.g. hadoop."),
INSTANCE_TEMPLATES(String.class, false, "The number of instances " +
- "to launch for each set of roles. E.g. 1 nn+jt,10 dn+tt means " +
- "one instance with the roles nn (namenode) and jt (jobtracker)," +
- " and ten instances each with the roles dn (datanode) and tt " +
- "(tasktracker)."),
+ "to launch for each set of roles. E.g. 1 hadoop-namenode+" +
+ "hadoop-jobtracker, 10 hadoop-datanode+hadoop-tasktracker"),
PROVIDER(String.class, false, "The name of the cloud provider. " +
"E.g. ec2, cloudservers"),
@@ -152,6 +153,22 @@ public class ClusterSpec {
* This is done by specifying the number of instances in each role.
*/
public static class InstanceTemplate {
+ private static Map<String, String> aliases = new HashMap<String, String>();
+ private static final Logger LOG = LoggerFactory.getLogger(InstanceTemplate.class);
+
+ static {
+ /*
+ * WARNING: this is not a generic aliasing mechanism. This code
+ * should be removed in the following releases and it's
+ * used only temporary to deprecate short legacy role names.
+ */
+ aliases.put("nn", "hadoop-namenode");
+ aliases.put("jt", "hadoop-jobtracker");
+ aliases.put("dn", "hadoop-datanode");
+ aliases.put("tt", "hadoop-tasktracker");
+ aliases.put("zk", "zookeeper");
+ }
+
private Set<String> roles;
private int numberOfInstances;
@@ -164,8 +181,23 @@ public class ClusterSpec {
checkArgument(!StringUtils.contains(role, " "),
"Role '%s' may not contain space characters.", role);
}
+
+ this.roles = replaceAliases(roles);
this.numberOfInstances = numberOfInstances;
- this.roles = roles;
+ }
+
+ private Set<String> replaceAliases(Set<String> roles) {
+ Set<String> newRoles = Sets.newLinkedHashSet();
+ for(String role : roles) {
+ if (aliases.containsKey(role)) {
+ LOG.warn("Role name '{}' is deprecated, use '{}'",
+ role, aliases.get(role));
+ newRoles.add(aliases.get(role));
+ } else {
+ newRoles.add(role);
+ }
+ }
+ return newRoles;
}
public Set<String> getRoles() {
Modified: incubator/whirr/trunk/core/src/test/java/org/apache/whirr/service/ClusterSpecTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/test/java/org/apache/whirr/service/ClusterSpecTest.java?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/test/java/org/apache/whirr/service/ClusterSpecTest.java (original)
+++ incubator/whirr/trunk/core/src/test/java/org/apache/whirr/service/ClusterSpecTest.java Mon Jan 31 05:36:18 2011
@@ -25,15 +25,18 @@ import static org.junit.Assert.assertTha
import com.google.common.collect.Iterables;
import com.google.common.collect.Iterators;
import com.google.common.collect.Lists;
+import com.google.common.collect.Sets;
import com.google.common.io.Files;
import com.jcraft.jsch.JSchException;
import java.io.File;
import java.io.FileReader;
import java.io.IOException;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.ConfigurationException;
@@ -207,4 +210,13 @@ public class ClusterSpecTest {
new InstanceTemplate(1, "a b");
}
+ @Test
+ public void testApplyRoleAliases() {
+ InstanceTemplate template = InstanceTemplate.parse("1 nn+jt+tt+dn+zk").get(0);
+ Set<String> expected = Sets.newLinkedHashSet(Arrays.asList(new String[]{
+ "hadoop-namenode", "hadoop-jobtracker", "hadoop-tasktracker",
+ "hadoop-datanode", "zookeeper"}));
+ assertThat(template.getRoles(), is(expected));
+ }
+
}
Modified: incubator/whirr/trunk/recipes/hadoop-ec2.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/recipes/hadoop-ec2.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/recipes/hadoop-ec2.properties (original)
+++ incubator/whirr/trunk/recipes/hadoop-ec2.properties Mon Jan 31 05:36:18 2011
@@ -26,7 +26,7 @@
whirr.cluster-name=hadoop
# Change the number of machines in the cluster here
-whirr.instance-templates=1 nn+jt,5 dn+tt
+whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker,5 hadoop-datanode+hadoop-tasktracker
# Uncomment out these lines to run CDH
#whirr.hadoop-install-runurl=cloudera/cdh/install
Modified: incubator/whirr/trunk/recipes/hadoop-rackspace.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/recipes/hadoop-rackspace.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/recipes/hadoop-rackspace.properties (original)
+++ incubator/whirr/trunk/recipes/hadoop-rackspace.properties Mon Jan 31 05:36:18 2011
@@ -26,7 +26,7 @@
whirr.cluster-name=hadoop
# Change the number of machines in the cluster here
-whirr.instance-templates=1 nn+jt,5 dn+tt
+whirr.instance-templates=1 hadoop-namenode+hadoop-jobtracker,5 hadoop-datanode+hadoop-tasktracker
# Uncomment out these lines to run CDH
#whirr.hadoop-install-runurl=cloudera/cdh/install
Modified: incubator/whirr/trunk/recipes/hbase-ec2.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/recipes/hbase-ec2.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/recipes/hbase-ec2.properties (original)
+++ incubator/whirr/trunk/recipes/hbase-ec2.properties Mon Jan 31 05:36:18 2011
@@ -26,7 +26,7 @@
whirr.cluster-name=hbase
# Change the number of machines in the cluster here
-whirr.instance-templates=1 zk+nn+jt+hbase-master,5 dn+tt+hbase-regionserver
+whirr.instance-templates=1 zookeeper+hadoop-namenode+hadoop-jobtracker+hbase-master,5 hadoop-datanode+hadoop-tasktracker+hbase-regionserver
# Uncomment out these lines to run CDH
#whirr.hadoop-install-runurl=cloudera/cdh/install
Modified: incubator/whirr/trunk/recipes/zookeeper-ec2.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/recipes/zookeeper-ec2.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/recipes/zookeeper-ec2.properties (original)
+++ incubator/whirr/trunk/recipes/zookeeper-ec2.properties Mon Jan 31 05:36:18 2011
@@ -26,7 +26,7 @@
whirr.cluster-name=zookeeper
# Change the number of machines in the cluster here
-whirr.instance-templates=3 zk
+whirr.instance-templates=3 zookeeper
# For EC2 set AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY environment variables.
whirr.provider=ec2
Modified: incubator/whirr/trunk/scripts/apache/hadoop/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/hadoop/post-configure?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/hadoop/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/hadoop/post-configure Mon Jan 31 05:36:18 2011
@@ -393,20 +393,20 @@ configure_hadoop
for role in $(echo "$ROLES" | tr "," "\n"); do
case $role in
- nn)
+ hadoop-namenode)
setup_web
start_namenode
;;
- snn)
+ hadoop-secondarynamenode)
start_daemon secondarynamenode
;;
- jt)
+ hadoop-jobtracker)
start_daemon jobtracker
;;
- dn)
+ hadoop-datanode)
start_daemon datanode
;;
- tt)
+ hadoop-tasktracker)
start_daemon tasktracker
;;
esac
Modified: incubator/whirr/trunk/scripts/cloudera/cdh/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/cloudera/cdh/post-configure?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/cloudera/cdh/post-configure (original)
+++ incubator/whirr/trunk/scripts/cloudera/cdh/post-configure Mon Jan 31 05:36:18 2011
@@ -60,10 +60,10 @@ HADOOP=hadoop-${HADOOP_VERSION:-0.20}
HADOOP_CONF_DIR=/etc/$HADOOP/conf.dist
for role in $(echo "$ROLES" | tr "," "\n"); do
case $role in
- nn)
+ hadoop-namenode)
NN_HOST=$SELF_HOST
;;
- jt)
+ hadoop-jobtracker)
JT_HOST=$SELF_HOST
;;
esac
@@ -458,21 +458,21 @@ configure_hadoop
for role in $(echo "$ROLES" | tr "," "\n"); do
case $role in
- nn)
+ hadoop-namenode)
#install_hue
start_namenode
#start_hue
;;
- snn)
+ hadoop-secondarynamenode)
start_daemon secondarynamenode
;;
- jt)
+ hadoop-jobtracker)
start_daemon jobtracker
;;
- dn)
+ hadoop-datanode)
start_daemon datanode
;;
- tt)
+ hadoop-tasktracker)
start_daemon tasktracker
;;
esac
Modified: incubator/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties (original)
+++ incubator/whirr/trunk/services/cdh/src/test/resources/whirr-hadoop-test.properties Mon Jan 31 05:36:18 2011
@@ -16,7 +16,7 @@
# limitations under the License.
#
whirr.cluster-name=cdhclustertest
-whirr.instance-templates=1 jt+nn,1 dn+tt
+whirr.instance-templates=1 hadoop-jobtracker+hadoop-namenode,1 hadoop-datanode+hadoop-tasktracker
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopDataNodeClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopDataNodeClusterActionHandler.java?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopDataNodeClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopDataNodeClusterActionHandler.java Mon Jan 31 05:36:18 2011
@@ -32,7 +32,7 @@ import org.apache.whirr.service.ClusterS
public class HadoopDataNodeClusterActionHandler extends ClusterActionHandlerSupport {
- public static final String ROLE = "dn";
+ public static final String ROLE = "hadoop-datanode";
@Override
public String getRole() {
@@ -64,7 +64,7 @@ public class HadoopDataNodeClusterAction
String hadoopConfigureRunUrl = clusterSpec.getConfiguration().getString(
"whirr.hadoop-configure-runurl", "apache/hadoop/post-configure");
addRunUrl(event, hadoopConfigureRunUrl,
- "dn,tt",
+ "hadoop-datanode,hadoop-tasktracker",
"-n", DnsUtil.resolveAddress(namenodePublicAddress.getHostAddress()),
"-j", DnsUtil.resolveAddress(jobtrackerPublicAddress.getHostAddress()),
"-c", clusterSpec.getProvider());
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopJobTrackerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopJobTrackerClusterActionHandler.java?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopJobTrackerClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopJobTrackerClusterActionHandler.java Mon Jan 31 05:36:18 2011
@@ -23,7 +23,7 @@ import org.apache.whirr.service.ClusterA
// Currently the jobtracker is started by HadoopNameNodeClusterActionHandler
public class HadoopJobTrackerClusterActionHandler extends ClusterActionHandlerSupport {
- public static final String ROLE = "jt";
+ public static final String ROLE = "hadoop-jobtracker";
@Override
public String getRole() {
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopNameNodeClusterActionHandler.java Mon Jan 31 05:36:18 2011
@@ -47,7 +47,7 @@ public class HadoopNameNodeClusterAction
private static final Logger LOG =
LoggerFactory.getLogger(HadoopNameNodeClusterActionHandler.class);
- public static final String ROLE = "nn";
+ public static final String ROLE = "hadoop-namenode";
public static final int WEB_PORT = 80;
public static final int NAMENODE_PORT = 8020;
@@ -103,7 +103,7 @@ public class HadoopNameNodeClusterAction
String hadoopConfigureRunUrl = clusterSpec.getConfiguration().getString(
"whirr.hadoop-configure-runurl", "apache/hadoop/post-configure");
addRunUrl(event, hadoopConfigureRunUrl,
- "nn,jt",
+ "hadoop-namenode,hadoop-jobtracker",
"-n", DnsUtil.resolveAddress(namenodePublicAddress.getHostAddress()),
"-j", DnsUtil.resolveAddress(jobtrackerPublicAddress.getHostAddress()),
"-c", clusterSpec.getProvider());
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTaskTrackerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTaskTrackerClusterActionHandler.java?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTaskTrackerClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTaskTrackerClusterActionHandler.java Mon Jan 31 05:36:18 2011
@@ -23,7 +23,7 @@ import org.apache.whirr.service.ClusterA
// Currently the tasktracker is started by HadoopDataNodeClusterActionHandler
public class HadoopTaskTrackerClusterActionHandler extends ClusterActionHandlerSupport {
- public static final String ROLE = "tt";
+ public static final String ROLE = "hadoop-tasktracker";
@Override
public String getRole() {
Modified: incubator/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties (original)
+++ incubator/whirr/trunk/services/hadoop/src/test/resources/whirr-hadoop-test.properties Mon Jan 31 05:36:18 2011
@@ -16,7 +16,7 @@
# limitations under the License.
#
whirr.cluster-name=hadoopclustertest
-whirr.instance-templates=1 jt+nn,1 dn+tt
+whirr.instance-templates=1 hadoop-jobtracker+hadoop-namenode,1 hadoop-datanode+hadoop-tasktracker
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
Modified: incubator/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties (original)
+++ incubator/whirr/trunk/services/hbase/src/test/resources/whirr-hbase-test.properties Mon Jan 31 05:36:18 2011
@@ -16,7 +16,7 @@
# limitations under the License.
#
whirr.cluster-name=hbaseclustertest
-whirr.instance-templates=1 zk,1 nn+jt+hbase-master,1 hbase-restserver,1 dn+tt+hbase-regionserver
+whirr.instance-templates=1 zookeeper,1 hadoop-namenode+hadoop-jobtracker+hbase-master,1 hbase-restserver,1 hadoop-datanode+hadoop-tasktracker+hbase-regionserver
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
@@ -26,4 +26,4 @@ whirr.hardware-id=m1.large
# Ubuntu 10.04 LTS Lucid instance-store - see http://alestic.com/
whirr.image-id=us-east-1/ami-da0cf8b3
whirr.location-id=us-east-1
-whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.89.20100924/hbase-0.89.20100924-bin.tar.gz
\ No newline at end of file
+whirr.hbase.tarball.url=http://archive.apache.org/dist/hbase/hbase-0.89.20100924/hbase-0.89.20100924-bin.tar.gz
Modified: incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java Mon Jan 31 05:36:18 2011
@@ -42,7 +42,7 @@ public class ZooKeeperClusterActionHandl
private static final Logger LOG =
LoggerFactory.getLogger(ZooKeeperClusterActionHandler.class);
- public static final String ZOOKEEPER_ROLE = "zk";
+ public static final String ZOOKEEPER_ROLE = "zookeeper";
private static final int CLIENT_PORT = 2181;
@Override
Modified: incubator/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties (original)
+++ incubator/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties Mon Jan 31 05:36:18 2011
@@ -16,7 +16,7 @@
# limitations under the License.
#
whirr.cluster-name=zkclustertest
-whirr.instance-templates=2 zk
+whirr.instance-templates=2 zookeeper
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
Modified: incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence?rev=1065482&r1=1065481&r2=1065482&view=diff
==============================================================================
--- incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence (original)
+++ incubator/whirr/trunk/src/site/confluence/quick-start-guide.confluence Mon Jan 31 05:36:18 2011
@@ -38,7 +38,7 @@ directory of the distribution.
{code}
whirr.cluster-name=myhadoopcluster
-whirr.instance-templates=1 jt+nn,1 dn+tt
+whirr.instance-templates=1 hadoop-jobtracker+hadoop-namenode,1 hadoop-datanode+hadoop-tasktracker
whirr.provider=ec2
whirr.identity=${env:AWS_ACCESS_KEY_ID}
whirr.credential=${env:AWS_SECRET_ACCESS_KEY}
@@ -153,7 +153,7 @@ for properties is not reflected in the c
{code}
% bin/whirr launch-cluster \
--cluster-name=myhadoopcluster \
- --instance-templates='1 jt+nn,1 dn+tt' \
+ --instance-templates='1 hadoop-jobtracker+hadoop-namenode,1 hadoop-datanode+hadoop-tasktracker' \
--provider=ec2 \
--identity=$AWS_ACCESS_KEY_ID \
--credential=$AWS_SECRET_ACCESS_KEY \