This commit is contained in:
Adrian Cole 2011-12-19 01:52:42 -08:00
parent bf99fb10a0
commit 6bac1db9fb
2 changed files with 2 additions and 2 deletions

View File

@ -198,7 +198,7 @@ public class EC2CreateNodesInGroupThenAddToSet implements CreateNodesInGroupThen
// block until instance is running
logger.debug(">> awaiting status running instance(%s)", coordinates);
nodeRunning.apply(runningInstanceToNodeMetadata.apply(startedInstance));
logger.debug("<< running instance(%s)", coordinates);
logger.trace("<< running instance(%s)", coordinates);
logger.debug(">> associating elastic IP %s to instance %s", ip, coordinates);
client.getElasticIPAddressServices().associateAddressInRegion(region, ip, id);
logger.trace("<< associated elastic IP %s to instance %s", ip, coordinates);

View File

@ -67,7 +67,7 @@ public class AWSEC2DestroyNodeStrategy extends EC2DestroyNodeStrategy {
credentialStore.remove("node#" + region + "/" + spotId);
} catch (NoSuchElementException e) {
}
super.destroyInstanceInRegion(region, id);
super.destroyInstanceInRegion(id, region);
} else {
client.getSpotInstanceServices().cancelSpotInstanceRequestsInRegion(region, spotId);
credentialStore.remove("node#" + region + "/" + id);