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/06/07 00:21:06 UTC
svn commit: r1132805 - in /incubator/whirr/trunk: ./
cli/src/main/java/org/apache/whirr/cli/command/
core/src/main/java/org/apache/whirr/service/jclouds/
core/src/test/java/org/apache/whirr/actions/
services/hadoop/src/test/java/org/apache/whirr/servic...
Author: asavu
Date: Mon Jun 6 22:21:05 2011
New Revision: 1132805
URL: http://svn.apache.org/viewvc?rev=1132805&view=rev
Log:
WHIRR-327. Upgrade to jclouds 1.0.0 (Adrian Cole and asavu)
Modified:
incubator/whirr/trunk/CHANGES.txt
incubator/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/RunUrlStatement.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/StatementBuilder.java
incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TakeLoginCredentialsFromWhirrProperties.java
incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java
incubator/whirr/trunk/pom.xml
incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java
Modified: incubator/whirr/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/CHANGES.txt?rev=1132805&r1=1132804&r2=1132805&view=diff
==============================================================================
--- incubator/whirr/trunk/CHANGES.txt (original)
+++ incubator/whirr/trunk/CHANGES.txt Mon Jun 6 22:21:05 2011
@@ -15,6 +15,8 @@ Trunk (unreleased changes)
WHIRR-323. Allow user to specify a blobstore container to be used
for caching local files (asavu)
+ WHIRR-327. Upgrade to jclouds 1.0.0 (Adrian Cole and asavu)
+
BUG FIXES
WHIRR-315. Temporary override Providers#withIds until jclouds
Modified: incubator/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java?rev=1132805&r1=1132804&r2=1132805&view=diff
==============================================================================
--- incubator/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java (original)
+++ incubator/whirr/trunk/cli/src/main/java/org/apache/whirr/cli/command/RunScriptCommand.java Mon Jun 6 22:21:05 2011
@@ -20,7 +20,6 @@ package org.apache.whirr.cli.command;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
-import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -35,12 +34,10 @@ import org.apache.whirr.ClusterControlle
import org.apache.whirr.ClusterSpec;
import org.apache.whirr.command.AbstractClusterCommand;
import org.apache.whirr.service.ClusterStateStoreFactory;
-import org.jclouds.compute.domain.ComputeMetadata;
import org.jclouds.compute.domain.ExecResponse;
import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.scriptbuilder.domain.Statement;
-import javax.annotation.Nullable;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -48,10 +45,9 @@ import java.io.PrintStream;
import java.nio.charset.Charset;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.whirr.RolePredicates.anyRoleIn;
+import static org.jclouds.compute.predicates.NodePredicates.withIds;
import static org.jclouds.scriptbuilder.domain.Statements.exec;
public class RunScriptCommand extends AbstractClusterCommand {
@@ -144,25 +140,6 @@ public class RunScriptCommand extends Ab
return condition;
}
- /**
- * temporary override Providers#withIds until jclouds beta-10 is out
- */
- @Deprecated
- private <T extends ComputeMetadata> Predicate<T> withIds(String ... ids) {
- final Set<String> search = ImmutableSet.copyOf(checkNotNull(ids, "ids must be defined"));
- return new Predicate<T>() {
- @Override
- public boolean apply(@Nullable T computeMetadata) {
- if (computeMetadata != null) return search.contains(computeMetadata.getId());
- return false;
- }
- @Override
- public String toString() {
- return "withIds(" + search + ")";
- }
- };
- }
-
private int handleScriptOutput(PrintStream out, PrintStream err,
Map<? extends NodeMetadata, ExecResponse> responses) {
int rc = 0;
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/RunUrlStatement.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/RunUrlStatement.java?rev=1132805&r1=1132804&r2=1132805&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/RunUrlStatement.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/RunUrlStatement.java Mon Jun 6 22:21:05 2011
@@ -59,7 +59,7 @@ public class RunUrlStatement implements
}
@Override
- public Iterable<String> functionDependecies(OsFamily family) {
+ public Iterable<String> functionDependencies(OsFamily family) {
return ImmutableSet.<String>of("install_runurl");
}
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=1132805&r1=1132804&r2=1132805&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 Jun 6 22:21:05 2011
@@ -43,10 +43,10 @@ public class StatementBuilder implements
}
@Override
- public Iterable<String> functionDependecies(OsFamily family) {
+ public Iterable<String> functionDependencies(OsFamily family) {
List<String> functions = Lists.newArrayList();
for (Statement statement : statements) {
- Iterables.addAll(functions, statement.functionDependecies(family));
+ Iterables.addAll(functions, statement.functionDependencies(family));
}
return functions;
}
Modified: incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TakeLoginCredentialsFromWhirrProperties.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TakeLoginCredentialsFromWhirrProperties.java?rev=1132805&r1=1132804&r2=1132805&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TakeLoginCredentialsFromWhirrProperties.java (original)
+++ incubator/whirr/trunk/core/src/main/java/org/apache/whirr/service/jclouds/TakeLoginCredentialsFromWhirrProperties.java Mon Jun 6 22:21:05 2011
@@ -29,7 +29,7 @@ import org.jclouds.domain.Credentials;
import org.jclouds.ec2.compute.strategy.EC2PopulateDefaultLoginCredentialsForImageStrategy;
@Singleton
-// patch until jclouds 1.0-beta-10
+// patch until jclouds http://code.google.com/p/jclouds/issues/detail?id=441
public class TakeLoginCredentialsFromWhirrProperties extends
EC2PopulateDefaultLoginCredentialsForImageStrategy {
Modified: incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java?rev=1132805&r1=1132804&r2=1132805&view=diff
==============================================================================
--- incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java (original)
+++ incubator/whirr/trunk/core/src/test/java/org/apache/whirr/actions/BootstrapClusterActionTest.java Mon Jun 6 22:21:05 2011
@@ -25,6 +25,7 @@ import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import com.google.common.base.Function;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -292,7 +293,7 @@ public class BootstrapClusterActionTest
NodeMetadata nodeMeta = new NodeMetadataImpl(
"ec2", "" + roles + id, "nodeId" + id + i,
location, new URI("http://node" + i),
- userMetadata, null, null, null, null, NodeState.RUNNING, 22,
+ userMetadata, ImmutableSet.<String>of(), null, null, null, null, NodeState.RUNNING, 22,
addresses, addresses, null, loginCredentials);
if (i < only) {
nodes.add(nodeMeta);
@@ -304,10 +305,11 @@ public class BootstrapClusterActionTest
}
if (failedNodes.size() > 0) {
Image image = new ImageImpl("ec2", "test", "testId", location, new URI("http://node"),
- userMetadata, new OperatingSystem(null, null, null, null, "op", true), "description",
- null, null, loginCredentials);
+ userMetadata, ImmutableSet.<String>of(), new OperatingSystem(null, null, null, null, "op", true),
+ "description", null, null, loginCredentials);
Hardware hardware = new HardwareImpl("ec2", "test", "testId", location, new URI("http://node"),
- userMetadata, new ArrayList<Processor>(), 1, new ArrayList<Volume>(), null);
+ userMetadata, ImmutableSet.<String>of(), new ArrayList<Processor>(), 1,
+ new ArrayList<Volume>(), null);
Template template = new TemplateImpl(image, hardware, location, TemplateOptions.NONE);
throw new RunNodesException("tag" + id, num, template, nodes, executionExceptions, failedNodes);
}
Modified: incubator/whirr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/pom.xml?rev=1132805&r1=1132804&r2=1132805&view=diff
==============================================================================
--- incubator/whirr/trunk/pom.xml (original)
+++ incubator/whirr/trunk/pom.xml Mon Jun 6 22:21:05 2011
@@ -50,7 +50,7 @@
</modules>
<properties>
- <jclouds.version>1.0-beta-9c</jclouds.version>
+ <jclouds.version>1.0.0</jclouds.version>
</properties>
<dependencyManagement>
Modified: incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java
URL: http://svn.apache.org/viewvc/incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java?rev=1132805&r1=1132804&r2=1132805&view=diff
==============================================================================
--- incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java (original)
+++ incubator/whirr/trunk/services/hadoop/src/test/java/org/apache/whirr/service/hadoop/HadoopConfigurationBuilderTest.java Mon Jun 6 22:21:05 2011
@@ -23,13 +23,13 @@ import static org.junit.Assert.assertTha
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterators;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import com.google.common.collect.Sets;
+import com.google.common.collect.ImmutableSet.Builder;
import java.util.List;
-import java.util.Set;
import org.apache.commons.configuration.Configuration;
import org.apache.commons.configuration.PropertiesConfiguration;
@@ -88,26 +88,26 @@ public class HadoopConfigurationBuilderT
private Cluster newCluster(int numberOfWorkers) {
NodeMetadata node = mock(NodeMetadata.class);
- List<Processor> processors = Lists.newArrayList(new Processor(4, 1.0));
+ List<Processor> processors = ImmutableList.of(new Processor(4, 1.0));
Hardware hardware = new HardwareImpl(null, null, "id", null, null,
- Maps.<String,String>newHashMap(), processors, 1024,
- Lists.<Volume>newArrayList(), null);
+ ImmutableMap.<String,String>of(), ImmutableSet.<String>of(), processors,
+ 1024, ImmutableList.<Volume>of(), null);
when(node.getHardware()).thenReturn(hardware);
- Set<Instance> instances = Sets.newLinkedHashSet();
+ Builder<Instance> instances = ImmutableSet.<Instance>builder();
Instance master = new Instance(new Credentials("", ""),
- Sets.newHashSet(HadoopNameNodeClusterActionHandler.ROLE,
+ ImmutableSet.of(HadoopNameNodeClusterActionHandler.ROLE,
HadoopJobTrackerClusterActionHandler.ROLE),
"10.0.0.1", "10.0.0.1", "1", node);
instances.add(master);
for (int i = 0; i < numberOfWorkers; i++) {
int id = i + 2;
instances.add(new Instance(new Credentials("", ""),
- Sets.newHashSet(HadoopDataNodeClusterActionHandler.ROLE,
+ ImmutableSet.of(HadoopDataNodeClusterActionHandler.ROLE,
HadoopTaskTrackerClusterActionHandler.ROLE),
"10.0.0." + id, "10.0.0." + id, id + "", node));
}
- return new Cluster(instances);
+ return new Cluster(instances.build());
}
@Test