Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

state bug

This commit is contained in:
Adrian Cole 2012-03-12 19:45:35 -07:00
parent 3570a63cd5
commit 67d70fae62
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apis/cloudservers/src/main/java/org/jclouds/cloudservers/compute/config/CloudServersComputeServiceContextModule.java
View File

@ -42,11 +42,9 @@ import org.jclouds.compute.domain.OperatingSystem;
import org.jclouds.compute.internal.BaseComputeService; import org.jclouds.compute.internal.BaseComputeService;
import org.jclouds.domain.Location; import org.jclouds.domain.Location;
import org.jclouds.functions.IdentityFunction; import org.jclouds.functions.IdentityFunction;
import org.jclouds.location.suppliers.implicit.OnlyLocationOrFirstZone;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.inject.Provides; import com.google.inject.Provides;
import com.google.inject.TypeLiteral; import com.google.inject.TypeLiteral;

1
compute/src/main/java/org/jclouds/compute/ComputeServiceAdapter.java
View File

@ -130,6 +130,7 @@ public interface ComputeServiceAdapter<N, H, I, L> {
N getNode(String id); N getNode(String id);
//TODO consider making reboot/resume/suspend return the node they affected
void destroyNode(String id); void destroyNode(String id);
void rebootNode(String id); void rebootNode(String id);

3
compute/src/main/java/org/jclouds/compute/predicates/AtomicNodeSuspended.java
View File

@ -23,6 +23,7 @@ import javax.inject.Singleton;
import org.jclouds.compute.domain.NodeState; import org.jclouds.compute.domain.NodeState;
import org.jclouds.compute.strategy.GetNodeMetadataStrategy; import org.jclouds.compute.strategy.GetNodeMetadataStrategy;
import com.google.common.collect.ImmutableSet;
import com.google.inject.Inject; import com.google.inject.Inject;
/** /**
@ -36,6 +37,6 @@ public class AtomicNodeSuspended extends RefreshAndDoubleCheckOnFailUnlessStateI
@Inject @Inject
public AtomicNodeSuspended(GetNodeMetadataStrategy client) { public AtomicNodeSuspended(GetNodeMetadataStrategy client) {
super(NodeState.SUSPENDED, client); super(NodeState.SUSPENDED, ImmutableSet.of(NodeState.ERROR, NodeState.TERMINATED), client);
} }
} }

23
compute/src/main/java/org/jclouds/compute/strategy/impl/AdaptingComputeServiceStrategies.java
View File

@ -116,31 +116,36 @@ public class AdaptingComputeServiceStrategies<N, H, I, L> implements CreateNodeW
return nodeMetadataAdapter.apply(node); return nodeMetadataAdapter.apply(node);
} }
//TODO: make reboot/resume/suspend return the node they affected
@Override @Override
public NodeMetadata rebootNode(String id) { public NodeMetadata rebootNode(String id) {
NodeMetadata node = getNode(checkNotNull(id, "id")); NodeMetadata node = getNode(checkNotNull(id, "id"));
if (node == null || node.getState() == NodeState.TERMINATED) checkStateAvailable(node);
return node;
client.rebootNode(id); client.rebootNode(id);
return node; // invalidate state of node
return getNode(checkNotNull(id, "id"));
}
private void checkStateAvailable(NodeMetadata node) {
checkState(node != null && node.getState() != NodeState.TERMINATED, "node %s terminated or unavailable!", node);
} }
@Override @Override
public NodeMetadata resumeNode(String id) { public NodeMetadata resumeNode(String id) {
NodeMetadata node = getNode(checkNotNull(id, "id")); NodeMetadata node = getNode(checkNotNull(id, "id"));
if (node == null || node.getState() == NodeState.TERMINATED || node.getState() == NodeState.RUNNING) checkStateAvailable(node);
return node;
client.resumeNode(id); client.resumeNode(id);
return node; // invalidate state of node
return getNode(checkNotNull(id, "id"));
} }
@Override @Override
public NodeMetadata suspendNode(String id) { public NodeMetadata suspendNode(String id) {
NodeMetadata node = getNode(checkNotNull(id, "id")); NodeMetadata node = getNode(checkNotNull(id, "id"));
if (node == null || node.getState() == NodeState.TERMINATED || node.getState() == NodeState.SUSPENDED) checkStateAvailable(node);
return node;
client.suspendNode(id); client.suspendNode(id);
return node; // invalidate state of node
return getNode(checkNotNull(id, "id"));
} }
@Override @Override