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 2012/01/17 11:04:34 UTC
svn commit: r1232375 - in /whirr/trunk: ./
cli/src/main/java/org/apache/whirr/cli/command/
core/src/main/java/org/apache/whirr/
core/src/main/java/org/apache/whirr/service/
core/src/main/java/org/apache/whirr/service/jclouds/
core/src/main/java/org/apa...
Author: asavu
Date: Tue Jan 17 10:04:33 2012
New Revision: 1232375
URL: http://svn.apache.org/viewvc?rev=1232375&view=rev
Log:
WHIRR-456. Upgrade to jclouds 1.3.0 (asavu)
Removed:
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/BindBootstrapCredentialsPatchForEC2.java
whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TakeBootstrapCredentialsFromWhirrProperties.java
whirr/trunk/core/src/test/java/org/apache/whirr/service/jclouds/TakeBootstrapCredentialsFromWhirrPropertiesTest.java
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/VersionCommand.java
whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java
whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
whirr/trunk/core/src/main/java/org/apache/whirr/service/DryRunModule.java
whirr/trunk/core/src/main/java/org/apache/whirr/state/BlobClusterStateStore.java
whirr/trunk/core/src/main/java/org/apache/whirr/state/FileClusterStateStore.java
whirr/trunk/core/src/main/resources/whirr-default.properties
whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java
whirr/trunk/core/src/test/resources/whirr-core-phase-barrier-test.properties
whirr/trunk/pom.xml
whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties
whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties
whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties
whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties
whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
Modified: whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Tue Jan 17 10:04:33 2012
@@ -21,6 +21,8 @@ Trunk (unreleased changes)
WHIRR-475. Rename login-user to bootstrap-user to avoid confusions (asavu)
+ WHIRR-456. Upgrade to jclouds 1.3.0 (asavu)
+
BUG FIXES
WHIRR-367. Wrong groupId for zookeeper (Joe Crobak via asavu)
Modified: whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/VersionCommand.java
URL: http://svn.apache.org/viewvc/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/VersionCommand.java?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/VersionCommand.java (original)
+++ whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/VersionCommand.java Tue Jan 17 10:04:33 2012
@@ -24,6 +24,7 @@ import java.util.List;
import org.apache.commons.io.IOUtils;
import org.apache.whirr.command.Command;
+import org.jclouds.JcloudsVersion;
public class VersionCommand extends Command {
@@ -40,6 +41,7 @@ public class VersionCommand extends Comm
return -1;
}
out.write(IOUtils.toByteArray(input));
+ out.println("jclouds " + JcloudsVersion.get().toString());
return 0;
}
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java (original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/ClusterSpec.java Tue Jan 17 10:04:33 2012
@@ -839,10 +839,6 @@ public class ClusterSpec {
public void setBootstrapUser(String bootstrapUser) {
this.bootstrapUser = bootstrapUser;
- if (this.bootstrapUser != null) {
- // patch until jclouds 1.0-beta-10
- System.setProperty("whirr.bootstrap-user", this.bootstrapUser);
- }
}
@Deprecated
@@ -880,8 +876,7 @@ public class ClusterSpec {
* @return the directory for storing cluster-related files
*/
public File getClusterDirectory() {
- File clusterDir = new File(new File(System.getProperty("user.home")),
- ".whirr");
+ File clusterDir = new File(new File(System.getProperty("user.home")), ".whirr");
clusterDir = new File(clusterDir, getClusterName());
clusterDir.mkdirs();
return clusterDir;
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java (original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/service/ComputeCache.java Tue Jan 17 10:04:33 2012
@@ -202,6 +202,9 @@ public enum ComputeCache implements Func
}
}
overrides = ConfigurationConverter.getProperties(jcloudsConfig);
+ if (spec.getBootstrapUser() != null) {
+ overrides.put(provider + ".image.login-user", spec.getBootstrapUser());
+ }
if ("aws-ec2".equals(spec.getProvider()) && spec.getImageId() != null) {
enableAWSEC2LazyImageFetching(spec);
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/service/DryRunModule.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/service/DryRunModule.java?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/service/DryRunModule.java (original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/service/DryRunModule.java Tue Jan 17 10:04:33 2012
@@ -48,6 +48,7 @@ import org.jclouds.compute.domain.NodeMe
import org.jclouds.compute.domain.internal.NodeMetadataImpl;
import org.jclouds.crypto.CryptoStreams;
import org.jclouds.domain.Credentials;
+import org.jclouds.domain.LoginCredentials;
import org.jclouds.io.Payload;
import org.jclouds.io.payloads.StringPayload;
import org.jclouds.net.IPSocket;
@@ -266,14 +267,9 @@ public class DryRunModule extends Abstra
}
@Override
- public SshClient create(IPSocket socket, String username, String password) {
- return create(socket, new Credentials(username, password));
- }
-
- @Override
- public SshClient create(IPSocket socket, String username,
- byte[] privateKey) {
- return create(socket, new Credentials(username, new String(privateKey)));
+ public SshClient create(IPSocket socket, LoginCredentials credentials) {
+ return clientMap.get(new Key(socket, credentials, find(nodes.values(),
+ new NodeHasAddress(socket.getAddress()))));
}
}
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/state/BlobClusterStateStore.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/state/BlobClusterStateStore.java?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/state/BlobClusterStateStore.java (original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/state/BlobClusterStateStore.java Tue Jan 17 10:04:33 2012
@@ -70,8 +70,7 @@ public class BlobClusterStateStore exten
public void save(Cluster cluster) throws IOException {
BlobStore store = context.getBlobStore();
- Blob blob = store.newBlob(blobName);
- blob.setPayload(serialize(cluster));
+ Blob blob = store.blobBuilder(blobName).payload(serialize(cluster)).build();
store.putBlob(container, blob);
LOG.info("Saved cluster state to '{}' ", context.getSigner()
Modified: whirr/trunk/core/src/main/java/org/apache/whirr/state/FileClusterStateStore.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/java/org/apache/whirr/state/FileClusterStateStore.java?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/main/java/org/apache/whirr/state/FileClusterStateStore.java (original)
+++ whirr/trunk/core/src/main/java/org/apache/whirr/state/FileClusterStateStore.java Tue Jan 17 10:04:33 2012
@@ -20,6 +20,7 @@ package org.apache.whirr.state;
import java.io.File;
import java.io.IOException;
+import org.apache.commons.io.FileUtils;
import org.apache.whirr.Cluster;
import org.apache.whirr.ClusterSpec;
import org.slf4j.Logger;
@@ -57,7 +58,7 @@ public class FileClusterStateStore exten
@Override
public void destroy() throws IOException {
- Files.deleteRecursively(spec.getClusterDirectory());
+ FileUtils.deleteDirectory(spec.getClusterDirectory());
}
@Override
Modified: whirr/trunk/core/src/main/resources/whirr-default.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/main/resources/whirr-default.properties?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/main/resources/whirr-default.properties (original)
+++ whirr/trunk/core/src/main/resources/whirr-default.properties Tue Jan 17 10:04:33 2012
@@ -23,4 +23,4 @@ whirr.cluster-user=${sys:user.name}
whirr.state-store=local
-jclouds.modules=org.jclouds.logging.slf4j.config.SLF4JLoggingModule,org.jclouds.enterprise.config.EnterpriseConfigurationModule,org.jclouds.sshj.config.SshjSshClientModule,org.apache.whirr.service.jclouds.BindLoginCredentialsPatchForEC2
\ No newline at end of file
+jclouds.modules=org.jclouds.logging.slf4j.config.SLF4JLoggingModule,org.jclouds.enterprise.config.EnterpriseConfigurationModule,org.jclouds.sshj.config.SshjSshClientModule
\ No newline at end of file
Modified: whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java (original)
+++ whirr/trunk/core/src/test/java/org/apache/whirr/ClusterSpecTest.java Tue Jan 17 10:04:33 2012
@@ -70,15 +70,6 @@ public class ClusterSpecTest {
}
@Test
- public void testBootstrapUserSetsSystemProperty()
- throws ConfigurationException {
- Configuration conf = new PropertiesConfiguration();
- conf.setProperty(ClusterSpec.Property.BOOTSTRAP_USER.getConfigName(), "ubuntu");
- ClusterSpec.withNoDefaults(conf);
- assertThat(System.getProperty("whirr.bootstrap-user"), is("ubuntu"));
- }
-
- @Test
public void testGetConfigurationForKeysWithPrefix()
throws ConfigurationException, JSchException, IOException {
Configuration conf = new PropertiesConfiguration();
Modified: whirr/trunk/core/src/test/resources/whirr-core-phase-barrier-test.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/core/src/test/resources/whirr-core-phase-barrier-test.properties?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/core/src/test/resources/whirr-core-phase-barrier-test.properties (original)
+++ whirr/trunk/core/src/test/resources/whirr-core-phase-barrier-test.properties Tue Jan 17 10:04:33 2012
@@ -22,6 +22,5 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-# Waiting until http://code.google.com/p/jclouds/issues/detail?id=746
-# whirr.hardware-min-ram=512
+whirr.hardware-min-ram=512
Modified: whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/whirr/trunk/pom.xml?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/pom.xml (original)
+++ whirr/trunk/pom.xml Tue Jan 17 10:04:33 2012
@@ -54,7 +54,7 @@
</modules>
<properties>
- <jclouds.version>1.2.2</jclouds.version>
+ <jclouds.version>1.3.0</jclouds.version>
</properties>
<dependencyManagement>
@@ -62,7 +62,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>10.0.1</version>
+ <version>11.0.1</version>
</dependency>
<dependency>
<groupId>ca.juliusdavies</groupId>
Modified: whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties (original)
+++ whirr/trunk/services/cassandra/src/test/resources/whirr-cassandra-test.properties Tue Jan 17 10:04:33 2012
@@ -22,6 +22,5 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-# Waiting for http://code.google.com/p/jclouds/issues/detail?id=746
-# whirr.hardware-min-ram=512
+whirr.hardware-min-ram=512
Modified: whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties (original)
+++ whirr/trunk/services/cdh/src/test/resources/whirr-zookeeper-test.properties Tue Jan 17 10:04:33 2012
@@ -27,6 +27,5 @@ whirr.env.repo=cdh3u2
whirr.zookeeper.install-function=install_cdh_zookeeper
whirr.zookeeper.configure-function=configure_cdh_zookeeper
-# Waiting for http://code.google.com/p/jclouds/issues/detail?id=746
-# whirr.hardware-min-ram=512
+whirr.hardware-min-ram=512
Modified: whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties (original)
+++ whirr/trunk/services/elasticsearch/src/test/resources/whirr-elasticsearch-test.properties Tue Jan 17 10:04:33 2012
@@ -22,6 +22,5 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-# Waiting for http://code.google.com/p/jclouds/issues/detail?id=746
-# whirr.hardware-min-ram=512
+whirr.hardware-min-ram=512
Modified: whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties (original)
+++ whirr/trunk/services/ganglia/src/test/resources/whirr-ganglia-test.properties Tue Jan 17 10:04:33 2012
@@ -22,6 +22,5 @@ whirr.provider=${sys:whirr.test.provider
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-# Waiting for http://code.google.com/p/jclouds/issues/detail?id=746
-# whirr.hardware-min-ram=512
+whirr.hardware-min-ram=512
Modified: whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties
URL: http://svn.apache.org/viewvc/whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties?rev=1232375&r1=1232374&r2=1232375&view=diff
==============================================================================
--- whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties (original)
+++ whirr/trunk/services/zookeeper/src/test/resources/whirr-zookeeper-test.properties Tue Jan 17 10:04:33 2012
@@ -17,10 +17,10 @@
#
whirr.cluster-name=zookeeper-itest-${sys:whirr.test.provider}-${sys:user.name}
whirr.instance-templates=2 zookeeper
+
whirr.provider=${sys:whirr.test.provider}
whirr.identity=${sys:whirr.test.identity}
whirr.credential=${sys:whirr.test.credential}
-# Waiting for http://code.google.com/p/jclouds/issues/detail?id=746
-# whirr.hardware-min-ram=512
+whirr.hardware-min-ram=512