You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@whirr.apache.org by as...@apache.org on 2011/02/07 22:08:48 UTC
svn commit: r1068135 - in /incubator/whirr/trunk: ./ cli/
cli/src/test/java/org/apache/whirr/cli/command/ core/
core/src/main/java/org/apache/whirr/cluster/actions/
core/src/main/java/org/apache/whirr/service/
core/src/main/java/org/apache/whirr/servic...
Author: asavu
Date: Mon Feb 7 21:08:47 2011
New Revision: 1068135
URL: http://svn.apache.org/viewvc?rev=1068135&view=rev
Log:
Reverted WHIRR-124 since the change is breaking the integration tests
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/cli/pom.xml
incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/ListClusterCommandTest.java
incubator/whirr/trunk/core/pom.xml
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/BootstrapClusterAction.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/DestroyClusterAction.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/ClusterSpec.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/Service.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/FirewallSettings.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/StatementBuilder.java
incubator/whirr/trunk/core/src/test/java/org/apache/whirr/service/ClusterSpecTest.java
incubator/whirr/trunk/pom.xml
incubator/whirr/trunk/scripts/apache/cassandra/post-configure
incubator/whirr/trunk/scripts/apache/hadoop/post-configure
incubator/whirr/trunk/scripts/apache/hbase/post-configure
incubator/whirr/trunk/scripts/apache/zookeeper/post-configure
incubator/whirr/trunk/services/cassandra/pom.xml
incubator/whirr/trunk/services/cdh/pom.xml
incubator/whirr/trunk/services/hadoop/pom.xml
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/HadoopNameNodeClusterActionHandler.java
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopProxy.java
incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java
incubator/whirr/trunk/services/hbase/pom.xml
incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseTemplateBuilderStrategy.java
incubator/whirr/trunk/services/zookeeper/pom.xml
incubator/whirr/trunk/services/zookeeper/src/main/java/org/apache/whirr/service/zookeeper/ZooKeeperClusterActionHandler.java
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Feb 7 21:08:47 2011
@@ -21,8 +21,6 @@ Trunk (unreleased changes)
WHIRR-183. ZooKeeper Data Directory Cleanup. (asavu via tomwhite)
- WHIRR-124. Upgrade to jclouds 1.0-beta-9 (Adrian Cole via larsgeorge)
-
BUG FIXES
WHIRR-170. Instances should be started in the order specified in
Modified: incubator/whirr/trunk/cli/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/cli/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/cli/pom.xml (original)
+++ incubator/whirr/trunk/cli/pom.xml Mon Feb 7 21:08:47 2011
@@ -63,15 +63,15 @@
<artifactId>jclouds-compute</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
</dependency>
<dependency>
@@ -95,10 +95,6 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
Modified: incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/ListClusterCommandTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/ListClusterCommandTest.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/ListClusterCommandTest.java (original)
+++ incubator/whirr/trunk/cli/src/test/java/org/apache/whirr/cli/command/ListClusterCommandTest.java Mon Feb 7 21:08:47 2011
@@ -41,10 +41,8 @@ import org.apache.whirr.service.ServiceF
import org.apache.whirr.ssh.KeyPair;
import org.hamcrest.Matcher;
import org.jclouds.compute.domain.NodeMetadata;
-import org.jclouds.compute.domain.NodeMetadataBuilder;
import org.jclouds.compute.domain.NodeState;
import org.jclouds.compute.domain.internal.NodeMetadataImpl;
-import org.jclouds.domain.LocationBuilder;
import org.jclouds.domain.LocationScope;
import org.jclouds.domain.internal.LocationImpl;
import org.junit.Before;
@@ -84,18 +82,20 @@ public class ListClusterCommandTest {
ServiceFactory factory = mock(ServiceFactory.class);
Service service = mock(Service.class);
when(factory.create((String) any())).thenReturn(service);
- NodeMetadata node1 = new NodeMetadataBuilder().name("name1").ids("id1")
- .location(new LocationBuilder().scope(LocationScope.PROVIDER)
- .id("location-id1").description("location-desc1").build())
- .imageId("image-id").state(NodeState.RUNNING)
- .publicAddresses(Lists.newArrayList("100.0.0.1"))
- .privateAddresses(Lists.newArrayList("10.0.0.1")).build();
- NodeMetadata node2 = new NodeMetadataBuilder().name("name2").ids("id2")
- .location(new LocationBuilder().scope(LocationScope.PROVIDER)
- .id("location-id2").description("location-desc2").build())
- .imageId("image-id").state(NodeState.RUNNING)
- .publicAddresses(Lists.newArrayList("100.0.0.2"))
- .privateAddresses(Lists.newArrayList("10.0.0.2")).build();
+ NodeMetadata node1 = new NodeMetadataImpl(null, "name1", "id1",
+ new LocationImpl(LocationScope.PROVIDER, "location-id1",
+ "location-desc1", null),
+ null, Collections.<String,String>emptyMap(), null, null, "image-id",
+ null, NodeState.RUNNING,
+ Lists.newArrayList("100.0.0.1"),
+ Lists.newArrayList("10.0.0.1"), null);
+ NodeMetadata node2 = new NodeMetadataImpl(null, "name2", "id2",
+ new LocationImpl(LocationScope.PROVIDER, "location-id2",
+ "location-desc2", null),
+ null, Collections.<String,String>emptyMap(), null, null, "image-id",
+ null, NodeState.RUNNING,
+ Lists.newArrayList("100.0.0.2"),
+ Lists.newArrayList("10.0.0.2"), null);
when(service.getNodes((ClusterSpec) any())).thenReturn(
(Set) Sets.newLinkedHashSet(Lists.newArrayList(node1, node2)));
Modified: incubator/whirr/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/core/pom.xml (original)
+++ incubator/whirr/trunk/core/pom.xml Mon Feb 7 21:08:47 2011
@@ -46,15 +46,15 @@
<artifactId>jclouds-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
</dependency>
<dependency>
@@ -95,10 +95,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/BootstrapClusterAction.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/BootstrapClusterAction.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/BootstrapClusterAction.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/BootstrapClusterAction.java Mon Feb 7 21:08:47 2011
@@ -18,7 +18,8 @@
package org.apache.whirr.cluster.actions;
-import static org.jclouds.compute.options.TemplateOptions.Builder.*;
+import static org.jclouds.compute.options.TemplateOptions.Builder.runScript;
+import static org.jclouds.io.Payloads.newStringPayload;
import com.google.common.base.Function;
import com.google.common.collect.Collections2;
@@ -53,11 +54,8 @@ import org.jclouds.compute.ComputeServic
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.scriptbuilder.domain.AuthorizeRSAPublicKey;
-import org.jclouds.scriptbuilder.domain.InstallRSAPrivateKey;
+import org.jclouds.io.Payload;
import org.jclouds.scriptbuilder.domain.OsFamily;
-import org.jclouds.scriptbuilder.domain.Statement;
-import org.jclouds.scriptbuilder.domain.StatementList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -103,7 +101,7 @@ public class BootstrapClusterAction exte
LOG.info("Starting {} node(s) with roles {}", num,
instanceTemplate.getRoles());
Set<? extends NodeMetadata> nodes = computeService
- .createNodesInGroup(clusterSpec.getClusterName(), num, template);
+ .runNodesWithTag(clusterSpec.getClusterName(), num, template);
LOG.info("Nodes started: {}", nodes);
return nodes;
}
@@ -137,14 +135,12 @@ public class BootstrapClusterAction exte
TemplateBuilderStrategy strategy)
throws MalformedURLException {
LOG.info("Configuring template");
- if (LOG.isDebugEnabled())
- LOG.debug("Running script:\n{}", statementBuilder.render(OsFamily.UNIX));
- Statement runScript = new StatementList(
- new AuthorizeRSAPublicKey(clusterSpec.getPublicKey()),
- statementBuilder,
- new InstallRSAPrivateKey(clusterSpec.getPrivateKey()));
+ Payload script = newStringPayload(statementBuilder.render(OsFamily.UNIX));
+ LOG.debug("Running script:\n{}", script.getRawContent());
TemplateBuilder templateBuilder = computeService.templateBuilder()
- .options(runScript(runScript));
+ .options(runScript(script)
+ .installPrivateKey(clusterSpec.getPrivateKey())
+ .authorizePublicKey(clusterSpec.getPublicKey()));
strategy.configureTemplateBuilder(clusterSpec, templateBuilder);
return templateBuilder.build();
}
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/ConfigureClusterAction.java Mon Feb 7 21:08:47 2011
@@ -18,6 +18,8 @@
package org.apache.whirr.cluster.actions;
+import static org.jclouds.io.Payloads.newStringPayload;
+
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
@@ -42,6 +44,7 @@ import org.jclouds.compute.RunScriptOnNo
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.options.RunScriptOptions;
import org.jclouds.domain.Credentials;
+import org.jclouds.io.Payload;
import org.jclouds.scriptbuilder.domain.OsFamily;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -73,14 +76,14 @@ public class ConfigureClusterAction exte
ComputeService computeService = computeServiceContext.getComputeService();
Credentials credentials = new Credentials(
Iterables.get(cluster.getInstances(), 0).getLoginCredentials().identity,
- clusterSpec.getPrivateKey());
+ clusterSpec.readPrivateKey());
try {
LOG.info("Running configuration script");
- if (LOG.isDebugEnabled())
- LOG.debug("Running script:\n{}", statementBuilder.render(OsFamily.UNIX));
+ Payload script = newStringPayload(statementBuilder.render(OsFamily.UNIX));
+ LOG.debug("Running script:\n{}", script.getRawContent());
computeService.runScriptOnNodesMatching(
toNodeMetadataPredicate(clusterSpec, cluster, entry.getKey().getRoles()),
- statementBuilder,
+ script,
RunScriptOptions.Builder.overrideCredentialsWith(credentials));
LOG.info("Configuration script run completed");
} catch (RunScriptOnNodesException e) {
@@ -99,7 +102,7 @@ public class ConfigureClusterAction exte
@Override
public boolean apply(NodeMetadata nodeMetadata) {
// Check it's the correct cluster
- if (!nodeMetadata.getGroup().equals(clusterSpec.getClusterName())) {
+ if (!nodeMetadata.getTag().equals(clusterSpec.getClusterName())) {
return false;
}
Instance instance = nodeIdToInstanceMap.get(nodeMetadata.getId());
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/DestroyClusterAction.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/DestroyClusterAction.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/DestroyClusterAction.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/cluster/actions/DestroyClusterAction.java Mon Feb 7 21:08:47 2011
@@ -18,7 +18,7 @@
package org.apache.whirr.cluster.actions;
-import static org.jclouds.compute.predicates.NodePredicates.inGroup;
+import static org.jclouds.compute.predicates.NodePredicates.withTag;
import java.io.IOException;
@@ -51,7 +51,7 @@ public class DestroyClusterAction extend
LOG.info("Destroying " + clusterSpec.getClusterName() + " cluster");
ComputeService computeService =
ComputeServiceContextBuilder.build(clusterSpec).getComputeService();
- computeService.destroyNodesMatching(inGroup(clusterSpec.getClusterName()));
+ computeService.destroyNodesMatching(withTag(clusterSpec.getClusterName()));
LOG.info("Cluster {} destroyed", clusterSpec.getClusterName());
return null;
}
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=1068135&r1=1068134&r2=1068135&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 Feb 7 21:08:47 2011
@@ -33,6 +33,7 @@ import org.apache.commons.configuration.
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;
@@ -50,6 +51,9 @@ import java.util.Set;
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;
/**
@@ -79,7 +83,7 @@ public class ClusterSpec {
"hadoop-jobtracker, 10 hadoop-datanode+hadoop-tasktracker"),
PROVIDER(String.class, false, "The name of the cloud provider. " +
- "E.g. aws-ec2, cloudservers-uk"),
+ "E.g. ec2, cloudservers"),
CREDENTIAL(String.class, false, "The cloud credential."),
@@ -251,11 +255,9 @@ public class ClusterSpec {
@VisibleForTesting
public static ClusterSpec withTemporaryKeys(Configuration conf)
throws ConfigurationException, JSchException, IOException {
+
if (!conf.containsKey(Property.PRIVATE_KEY_FILE.getConfigName())) {
Map<String, File> keys = org.apache.whirr.ssh.KeyPair.generateTemporaryFiles();
-
- LoggerFactory.getLogger(ClusterSpec.class).debug("ssh keys: " +
- keys.toString());
conf.addProperty(Property.PRIVATE_KEY_FILE.getConfigName(),
keys.get("private").getAbsolutePath());
@@ -285,9 +287,8 @@ public class ClusterSpec {
private String identity;
private String credential;
private String clusterName;
- private String privateKey;
- private File privateKeyFile;
- private String publicKey;
+ private Payload privateKey;
+ private Payload publicKey;
private String imageId;
private String hardwareId;
private String locationId;
@@ -408,15 +409,26 @@ public class ClusterSpec {
public String getClusterName() {
return clusterName;
}
- public String getPrivateKey() {
+ public Payload getPrivateKey() {
return privateKey;
}
- public File getPrivateKeyFile() {
- return privateKeyFile;
- }
- public String getPublicKey() {
+ public Payload getPublicKey() {
return publicKey;
}
+ /**
+ * @see #getPrivateKey
+ * @throws IOException if the payload cannot be read
+ */
+ public String readPrivateKey() throws IOException {
+ return toStringAndClose(getPrivateKey().getInput());
+ }
+ /**
+ * @see #getPublicKey
+ * @throws IOException if the payload cannot be read
+ */
+ public String readPublicKey() throws IOException {
+ return toStringAndClose(getPublicKey().getInput());
+ }
public String getImageId() {
return imageId;
}
@@ -467,7 +479,7 @@ public class ClusterSpec {
*/
public void setPublicKey(String publicKey) {
checkPublicKey(publicKey);
- this.publicKey = publicKey;
+ this.publicKey = newStringPayload(publicKey);
}
/**
@@ -477,9 +489,8 @@ public class ClusterSpec {
* @see #setPublicKey(String)
*/
public void setPublicKey(File publicKey) throws IOException {
- String key = IOUtils.toString(new FileReader(publicKey));
- checkPublicKey(key);
- this.publicKey = key;
+ checkPublicKey(IOUtils.toString(new FileReader(publicKey)));
+ this.publicKey = newFilePayload(publicKey);
}
private void checkPublicKey(String publicKey) {
@@ -499,7 +510,7 @@ public class ClusterSpec {
*/
public void setPrivateKey(String privateKey) {
checkPrivateKey(privateKey);
- this.privateKey = privateKey;
+ this.privateKey = newStringPayload(privateKey);
}
/**
@@ -509,10 +520,8 @@ public class ClusterSpec {
* @see #setPrivateKey(String)
*/
public void setPrivateKey(File privateKey) throws IOException {
- this.privateKeyFile = privateKey;
- String key = IOUtils.toString(new FileReader(privateKey));
- checkPrivateKey(key);
- this.privateKey = key;
+ checkPrivateKey(IOUtils.toString(new FileReader(privateKey)));
+ this.privateKey = newFilePayload(privateKey);
}
private void checkPrivateKey(String privateKey) {
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/Service.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/Service.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/Service.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/Service.java Mon Feb 7 21:08:47 2011
@@ -121,24 +121,24 @@ public class Service {
ComputeService computeService =
ComputeServiceContextBuilder.build(clusterSpec).getComputeService();
return computeService.listNodesDetailsMatching(
- runningInGroup(clusterSpec.getClusterName()));
+ runningWithTag(clusterSpec.getClusterName()));
}
- public static Predicate<ComputeMetadata> runningInGroup(final String group) {
+ public static Predicate<ComputeMetadata> runningWithTag(final String tag) {
return new Predicate<ComputeMetadata>() {
@Override
public boolean apply(ComputeMetadata computeMetadata) {
// Not all list calls return NodeMetadata (e.g. VCloud)
if (computeMetadata instanceof NodeMetadata) {
NodeMetadata nodeMetadata = (NodeMetadata) computeMetadata;
- return group.equals(nodeMetadata.getGroup())
+ return tag.equals(nodeMetadata.getTag())
&& nodeMetadata.getState() == NodeState.RUNNING;
}
return false;
}
@Override
public String toString() {
- return "runningInGroup(" + group + ")";
+ return "runningWithTag(" + tag + ")";
}
};
}
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/FirewallSettings.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/FirewallSettings.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/FirewallSettings.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/FirewallSettings.java Mon Feb 7 21:08:47 2011
@@ -18,6 +18,9 @@
package org.apache.whirr.service.jclouds;
+import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
+
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
@@ -28,13 +31,10 @@ import java.util.Set;
import org.apache.commons.io.IOUtils;
import org.apache.whirr.service.Cluster.Instance;
import org.apache.whirr.service.ClusterSpec;
-import org.jclouds.aws.util.AWSUtils;
+import org.jclouds.aws.ec2.EC2Client;
+import org.jclouds.aws.ec2.domain.IpProtocol;
+import org.jclouds.aws.ec2.util.EC2Utils;
import org.jclouds.compute.ComputeServiceContext;
-import org.jclouds.ec2.EC2Client;
-import org.jclouds.ec2.domain.IpProtocol;
-
-import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
/**
* Utility functions for controlling firewall settings for a cluster.
@@ -78,12 +78,11 @@ public class FirewallSettings {
private static void authorizeIngress(ComputeServiceContext computeServiceContext,
Set<Instance> instances, ClusterSpec clusterSpec, List<String> cidrs, int... ports) {
- if (computeServiceContext.getProviderSpecificContext().getApi() instanceof
- EC2Client) {
+ if (clusterSpec.getProvider().equals("ec2")) {
// This code (or something like it) may be added to jclouds (see
// http://code.google.com/p/jclouds/issues/detail?id=336).
// Until then we need this temporary workaround.
- String region = AWSUtils.parseHandle(Iterables.get(instances, 0).getId())[0];
+ String region = EC2Utils.parseHandle(Iterables.get(instances, 0).getId())[0];
EC2Client ec2Client = EC2Client.class.cast(
computeServiceContext.getProviderSpecificContext().getApi());
String groupName = "jclouds#" + clusterSpec.getClusterName() + "#" + region;
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/StatementBuilder.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/StatementBuilder.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/StatementBuilder.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/StatementBuilder.java Mon Feb 7 21:08:47 2011
@@ -51,7 +51,7 @@ public class StatementBuilder implements
for (Statement statement : statements) {
scriptBuilder.addStatement(statement);
}
- return scriptBuilder.render(family);
+ return scriptBuilder.build(family);
}
}
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=1068135&r1=1068134&r2=1068135&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 Feb 7 21:08:47 2011
@@ -122,7 +122,7 @@ public class ClusterSpecTest {
ClusterSpec spec = ClusterSpec.withNoDefaults(conf);
Assert.assertEquals(IOUtils.toString(
- new FileReader(keys.get("public"))), spec.getPublicKey());
+ new FileReader(keys.get("public"))), spec.readPublicKey());
}
@Test(expected = ConfigurationException.class)
Modified: incubator/whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/pom.xml (original)
+++ incubator/whirr/trunk/pom.xml Mon Feb 7 21:08:47 2011
@@ -47,7 +47,7 @@
</modules>
<properties>
- <jclouds.version>1.0-beta-9</jclouds.version>
+ <jclouds.version>1.0-beta-7</jclouds.version>
</properties>
<dependencyManagement>
@@ -64,26 +64,26 @@
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
+ <artifactId>jclouds-compute</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency>
<groupId>org.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
+ <artifactId>jclouds-core</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
<version>${jclouds.version}</version>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
<version>${jclouds.version}</version>
</dependency>
@@ -159,11 +159,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- <version>0.1.42</version>
- </dependency>
- <dependency>
<groupId>dnsjava</groupId>
<artifactId>dnsjava</artifactId>
<version>2.0.8</version>
Modified: incubator/whirr/trunk/scripts/apache/cassandra/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/cassandra/post-configure?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/cassandra/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/cassandra/post-configure Mon Feb 7 21:08:47 2011
@@ -37,7 +37,7 @@ case $CLOUD_PROVIDER in
# We want the gossip protocol to use internal (private) addresses, and the
# client to use public addresses.
# See http://wiki.apache.org/cassandra/FAQ#cant_listen_on_ip_any
- ec2 | aws-ec2 )
+ ec2)
PRIVATE_SELF_HOST=`wget -q -O - http://169.254.169.254/latest/meta-data/local-ipv4`
# EC2 is NATed
PUBLIC_SELF_HOST=$PRIVATE_SELF_HOST
Modified: incubator/whirr/trunk/scripts/apache/hadoop/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/hadoop/post-configure?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/hadoop/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/hadoop/post-configure Mon Feb 7 21:08:47 2011
@@ -50,7 +50,7 @@ while getopts "n:j:c:" OPTION; do
done
case $CLOUD_PROVIDER in
- ec2 | aws-ec2 )
+ ec2)
# Use public hostname for EC2
SELF_HOST=`wget -q -O - http://169.254.169.254/latest/meta-data/public-hostname`
;;
@@ -91,7 +91,7 @@ function make_hadoop_dirs {
# Configure Hadoop by setting up disks and site file
function configure_hadoop() {
case $CLOUD_PROVIDER in
- ec2 | aws-ec2 )
+ ec2)
MOUNT=/mnt
;;
*)
Modified: incubator/whirr/trunk/scripts/apache/hbase/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/hbase/post-configure?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/hbase/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/hbase/post-configure Mon Feb 7 21:08:47 2011
@@ -58,7 +58,7 @@ done
# determine machine name
case $CLOUD_PROVIDER in
- ec2 | aws-ec2 )
+ ec2)
# Use public hostname for EC2
SELF_HOST=`wget -q -O - http://169.254.169.254/latest/meta-data/public-hostname`
;;
@@ -85,7 +85,7 @@ HBASE_CONF_DIR=$HBASE_HOME/conf
# configure hbase by setting up disks and site file
function configure_hbase() {
case $CLOUD_PROVIDER in
- ec2 | aws-ec2 )
+ ec2)
MOUNT=/mnt
;;
*)
Modified: incubator/whirr/trunk/scripts/apache/zookeeper/post-configure
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/scripts/apache/zookeeper/post-configure?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/scripts/apache/zookeeper/post-configure (original)
+++ incubator/whirr/trunk/scripts/apache/zookeeper/post-configure Mon Feb 7 21:08:47 2011
@@ -36,7 +36,7 @@ done
case $CLOUD_PROVIDER in
# Use private IP for SELF_HOST
# ZooKeeper listens on all addresses, not just the one specified in server.<id>
- ec2 | aws-ec2 )
+ ec2)
SELF_HOST=`wget -q -O - http://169.254.169.254/latest/meta-data/local-ipv4`
;;
*)
@@ -81,4 +81,4 @@ if [[ $# -gt 1 ]]; then
fi
# Now that it's configured, start ZooKeeper
-nohup /etc/rc.local &
+nohup /etc/rc.local &
\ No newline at end of file
Modified: incubator/whirr/trunk/services/cassandra/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cassandra/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cassandra/pom.xml (original)
+++ incubator/whirr/trunk/services/cassandra/pom.xml Mon Feb 7 21:08:47 2011
@@ -54,15 +54,15 @@
<artifactId>jclouds-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
</dependency>
<dependency>
@@ -78,10 +78,6 @@
<artifactId>commons-configuration</artifactId>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: incubator/whirr/trunk/services/cdh/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/cdh/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/cdh/pom.xml (original)
+++ incubator/whirr/trunk/services/cdh/pom.xml Mon Feb 7 21:08:47 2011
@@ -59,15 +59,15 @@
<artifactId>jclouds-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
</dependency>
<dependency>
@@ -92,10 +92,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: incubator/whirr/trunk/services/hadoop/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/pom.xml (original)
+++ incubator/whirr/trunk/services/hadoop/pom.xml Mon Feb 7 21:08:47 2011
@@ -57,15 +57,15 @@
<artifactId>jclouds-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
</dependency>
<dependency>
@@ -90,10 +90,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
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=1068135&r1=1068134&r2=1068135&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 Feb 7 21:08:47 2011
@@ -41,7 +41,7 @@ public class HadoopDataNodeClusterAction
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
- ClusterSpec clusterSpec = event.getClusterSpec();
+ ClusterSpec clusterSpec = event.getClusterSpec();
addRunUrl(event, "util/configure-hostnames", "-c", clusterSpec.getProvider());
String hadoopInstallRunUrl = clusterSpec.getConfiguration().getString(
"whirr.hadoop-install-runurl", "apache/hadoop/install");
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=1068135&r1=1068134&r2=1068135&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 Feb 7 21:08:47 2011
@@ -137,7 +137,7 @@ public class HadoopNameNodeClusterAction
config.setProperty("mapred.job.tracker", String.format("%s:8021", DnsUtil.resolveAddress(jobtracker.getHostAddress())));
config.setProperty("hadoop.socks.server", "localhost:6666");
config.setProperty("hadoop.rpc.socket.factory.class.default", "org.apache.hadoop.net.SocksSocketFactory");
- if (clusterSpec.getProvider().endsWith("ec2")) {
+ if ("ec2".equals(clusterSpec.getProvider())) {
config.setProperty("fs.s3.awsAccessKeyId", clusterSpec.getIdentity());
config.setProperty("fs.s3.awsSecretAccessKey", clusterSpec.getCredential());
config.setProperty("fs.s3n.awsAccessKeyId", clusterSpec.getIdentity());
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopProxy.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopProxy.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopProxy.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopProxy.java Mon Feb 7 21:08:47 2011
@@ -20,8 +20,8 @@ package org.apache.whirr.service.hadoop;
import static com.google.common.base.Preconditions.checkState;
-import com.google.common.base.Charsets;
import com.google.common.collect.Iterables;
+import com.google.common.io.ByteStreams;
import com.google.common.io.Files;
import java.io.BufferedReader;
@@ -47,15 +47,16 @@ public class HadoopProxy {
}
public String[] getProxyCommand() throws IOException {
- checkState(clusterSpec.getPrivateKeyFile() != null ||
- clusterSpec.getPrivateKey() != null, "privateKey is needed");
- File identity = clusterSpec.getPrivateKeyFile();
- if (identity == null){
+ checkState(clusterSpec.getPrivateKey() != null, "privateKey is needed");
+ File identity;
+ if (clusterSpec.getPrivateKey().getRawContent() instanceof File) {
+ identity = File.class.cast(clusterSpec.getPrivateKey().getRawContent());
+ } else {
identity = File.createTempFile("hadoop", "key");
identity.deleteOnExit();
- Files.write(clusterSpec.getPrivateKey(), identity, Charsets.UTF_8);
+ Files.write(ByteStreams.toByteArray(clusterSpec.getPrivateKey().getInput()), identity);
+ KeyPair.setPermissionsTo600(identity);
}
- KeyPair.setPermissionsTo600(identity);
String user = Iterables.get(cluster.getInstances(), 0).getLoginCredentials().identity;
InetAddress namenode = HadoopCluster.getNamenodePublicAddress(cluster);
String server = DnsUtil.resolveAddress(namenode.getHostAddress());
Modified: incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/main/java/org/apache/whirr/service/hadoop/HadoopTemplateBuilderStrategy.java Mon Feb 7 21:08:47 2011
@@ -20,9 +20,9 @@ package org.apache.whirr.service.hadoop;
import org.apache.whirr.service.ClusterSpec;
import org.apache.whirr.service.jclouds.TemplateBuilderStrategy;
+import org.jclouds.aws.ec2.compute.domain.EC2Hardware;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.ec2.domain.InstanceType;
public class HadoopTemplateBuilderStrategy extends TemplateBuilderStrategy {
@@ -30,14 +30,14 @@ public class HadoopTemplateBuilderStrate
TemplateBuilder templateBuilder) {
super.configureTemplateBuilder(clusterSpec, templateBuilder);
- if (clusterSpec.getProvider().equals("aws-ec2")
+ if ("ec2".equals(clusterSpec.getProvider())
&& clusterSpec.getImageId() == null) {
templateBuilder.osFamily(OsFamily.AMZN_LINUX);
}
- if (clusterSpec.getProvider().endsWith("ec2")
+ if ("ec2".equals(clusterSpec.getProvider())
&& clusterSpec.getHardwareId() == null) {
// micro is too small for Hadoop (even for testing)
- templateBuilder.hardwareId(InstanceType.M1_SMALL);
+ templateBuilder.fromHardware(EC2Hardware.M1_SMALL);
}
}
}
Modified: incubator/whirr/trunk/services/hbase/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/pom.xml (original)
+++ incubator/whirr/trunk/services/hbase/pom.xml Mon Feb 7 21:08:47 2011
@@ -68,15 +68,15 @@
<artifactId>jclouds-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
</dependency>
<dependency>
@@ -101,10 +101,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
Modified: incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/BasicServerClusterActionHandler.java Mon Feb 7 21:08:47 2011
@@ -93,7 +93,7 @@ public class BasicServerClusterActionHan
String master = DnsUtil.resolveAddress(masterPublicAddress.getHostAddress());
String quorum = ZooKeeperCluster.getHosts(cluster);
String tarurl = getConfiguration(clusterSpec).getString(
- HBaseConstants.KEY_TARBALL_URL);
+ HBaseConstants.KEY_TARBALL_URL);
addRunUrl(event, hbaseConfigureRunUrl, role,
HBaseConstants.PARAM_MASTER, master,
HBaseConstants.PARAM_QUORUM, quorum,
Modified: incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseMasterClusterActionHandler.java Mon Feb 7 21:08:47 2011
@@ -60,7 +60,7 @@ public class HBaseMasterClusterActionHan
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
- ClusterSpec clusterSpec = event.getClusterSpec();
+ ClusterSpec clusterSpec = event.getClusterSpec();
addRunUrl(event, "util/configure-hostnames",
HBaseConstants.PARAM_PROVIDER, clusterSpec.getProvider());
addRunUrl(event, "sun/java/install");
@@ -95,7 +95,7 @@ public class HBaseMasterClusterActionHan
String master = DnsUtil.resolveAddress(masterPublicAddress.getHostAddress());
String quorum = ZooKeeperCluster.getHosts(cluster);
String tarurl = getConfiguration(clusterSpec).getString(
- HBaseConstants.KEY_TARBALL_URL);
+ HBaseConstants.KEY_TARBALL_URL);
addRunUrl(event, hbaseConfigureRunUrl, ROLE,
HBaseConstants.PARAM_MASTER, master,
HBaseConstants.PARAM_QUORUM, quorum,
Modified: incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java (original)
+++ incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseRegionServerClusterActionHandler.java Mon Feb 7 21:08:47 2011
@@ -47,7 +47,7 @@ public class HBaseRegionServerClusterAct
@Override
protected void beforeBootstrap(ClusterActionEvent event) throws IOException {
- ClusterSpec clusterSpec = event.getClusterSpec();
+ ClusterSpec clusterSpec = event.getClusterSpec();
addRunUrl(event, "util/configure-hostnames",
HBaseConstants.PARAM_PROVIDER, clusterSpec.getProvider());
addRunUrl(event, "sun/java/install");
@@ -84,7 +84,7 @@ public class HBaseRegionServerClusterAct
String master = DnsUtil.resolveAddress(masterPublicAddress.getHostAddress());
String quorum = ZooKeeperCluster.getHosts(cluster);
String tarurl = getConfiguration(clusterSpec).getString(
- HBaseConstants.KEY_TARBALL_URL);
+ HBaseConstants.KEY_TARBALL_URL);
addRunUrl(event, hbaseConfigureRunUrl, ROLE,
HBaseConstants.PARAM_MASTER, master,
HBaseConstants.PARAM_QUORUM, quorum,
Modified: incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseTemplateBuilderStrategy.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseTemplateBuilderStrategy.java?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseTemplateBuilderStrategy.java (original)
+++ incubator/whirr/trunk/services/hbase/src/main/java/org/apache/whirr/service/hbase/HBaseTemplateBuilderStrategy.java Mon Feb 7 21:08:47 2011
@@ -20,9 +20,9 @@ package org.apache.whirr.service.hbase;
import org.apache.whirr.service.ClusterSpec;
import org.apache.whirr.service.jclouds.TemplateBuilderStrategy;
+import org.jclouds.aws.ec2.compute.domain.EC2Hardware;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.TemplateBuilder;
-import org.jclouds.ec2.domain.InstanceType;
public class HBaseTemplateBuilderStrategy extends TemplateBuilderStrategy {
@@ -30,14 +30,14 @@ public class HBaseTemplateBuilderStrateg
TemplateBuilder templateBuilder) {
super.configureTemplateBuilder(clusterSpec, templateBuilder);
- if (clusterSpec.getProvider().equals("aws-ec2")
+ if ("ec2".equals(clusterSpec.getProvider())
&& clusterSpec.getImageId() == null) {
templateBuilder.osFamily(OsFamily.AMZN_LINUX);
}
- if (clusterSpec.getProvider().endsWith("ec2")
+ if ("ec2".equals(clusterSpec.getProvider())
&& clusterSpec.getHardwareId() == null) {
// micro is too small for Hadoop (even for testing)
- templateBuilder.hardwareId(InstanceType.M1_LARGE);
+ templateBuilder.fromHardware(EC2Hardware.M1_LARGE);
}
}
}
Modified: incubator/whirr/trunk/services/zookeeper/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/zookeeper/pom.xml?rev=1068135&r1=1068134&r2=1068135&view=diff
==============================================================================
--- incubator/whirr/trunk/services/zookeeper/pom.xml (original)
+++ incubator/whirr/trunk/services/zookeeper/pom.xml Mon Feb 7 21:08:47 2011
@@ -54,15 +54,15 @@
<artifactId>jclouds-core</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-enterprise</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-jsch</artifactId>
</dependency>
<dependency>
- <groupId>org.jclouds.driver</groupId>
+ <groupId>org.jclouds</groupId>
<artifactId>jclouds-log4j</artifactId>
</dependency>
<dependency>
@@ -87,10 +87,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>com.jcraft</groupId>
- <artifactId>jsch</artifactId>
- </dependency>
- <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<scope>test</scope>
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=1068135&r1=1068134&r2=1068135&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 Feb 7 21:08:47 2011
@@ -69,7 +69,7 @@ public class ZooKeeperClusterActionHandl
// Pass list of all servers in ensemble to configure script.
// Position is significant: i-th server has id i.
String servers = Joiner.on(' ').join(getPrivateIps(cluster.getInstancesMatching(
- RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE))));
+ RolePredicates.role(ZooKeeperClusterActionHandler.ZOOKEEPER_ROLE))));
addRunUrl(event, "apache/zookeeper/post-configure", "-c",
clusterSpec.getProvider(),
servers);