You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/09/13 11:17:37 UTC
[1/4] brooklyn-server git commit: Modify jcloudsLocation.releaseNode
Repository: brooklyn-server
Updated Branches:
refs/heads/master b9f14e556 -> 5827932c2
Modify jcloudsLocation.releaseNode
- from destroyNode to destroyNodesMatchingId as it calls consistently cleanUpIncidentalResourcesOfDeadNodes
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/53c0d440
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/53c0d440
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/53c0d440
Branch: refs/heads/master
Commit: 53c0d4408270a2aafab803c8e8ff5300f3fa38e9
Parents: 2c3e33b
Author: Andrea Turli <an...@gmail.com>
Authored: Fri Aug 25 17:58:45 2017 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Fri Aug 25 18:00:30 2017 +0200
----------------------------------------------------------------------
.../apache/brooklyn/location/jclouds/JcloudsLocation.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/53c0d440/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index e975520..8d32b2f 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -23,6 +23,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static org.apache.brooklyn.util.JavaGroovyEquivalents.elvis;
import static org.apache.brooklyn.util.JavaGroovyEquivalents.groovyTruth;
import static org.apache.brooklyn.util.ssh.BashCommands.sbinPath;
+import static org.jclouds.compute.predicates.NodePredicates.*;
import static org.jclouds.util.Throwables2.getFirstThrowableOfType;
import java.io.ByteArrayOutputStream;
@@ -145,6 +146,7 @@ import org.jclouds.compute.domain.OsFamily;
import org.jclouds.compute.domain.Template;
import org.jclouds.compute.domain.TemplateBuilder;
import org.jclouds.compute.options.TemplateOptions;
+import org.jclouds.compute.predicates.NodePredicates;
import org.jclouds.domain.Credentials;
import org.jclouds.domain.LocationScope;
import org.jclouds.domain.LoginCredentials;
@@ -2183,10 +2185,13 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
}
protected void releaseNode(String instanceId) {
- ComputeService computeService = null;
+ ComputeService computeService;
try {
computeService = getComputeService(config().getBag());
- computeService.destroyNode(instanceId);
+ // FIXME revert to computeService.destroyNode(instanceId); once JCLOUDS-1332 gets fixed
+ Set<? extends NodeMetadata> destroyed = computeService.destroyNodesMatching(withIds(instanceId));
+ LOG.debug("Destroyed nodes %s%n", destroyed);
+
} finally {
/*
// we don't close the compute service; this means if we provision add'l it is fast;
[4/4] brooklyn-server git commit: This closes #805
Posted by dr...@apache.org.
This closes #805
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/5827932c
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/5827932c
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/5827932c
Branch: refs/heads/master
Commit: 5827932c29eb64b571631b0d9b4f7ef1b5747f57
Parents: b9f14e5 ac5568d
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Wed Sep 13 12:17:30 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Wed Sep 13 12:17:30 2017 +0100
----------------------------------------------------------------------
.../location/jclouds/JcloudsLocation.java | 13 +++++++---
.../jclouds/StubbedComputeServiceRegistry.java | 26 ++++++++++++++++----
2 files changed, 31 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
[3/4] brooklyn-server git commit: Add destroyNodesMatching to
StubbedComputeServiceRegistry
Posted by dr...@apache.org.
Add destroyNodesMatching to StubbedComputeServiceRegistry
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ac5568d8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ac5568d8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ac5568d8
Branch: refs/heads/master
Commit: ac5568d81b16b77162ff1f7a83743a06c9b8db48
Parents: 233e220
Author: Andrea Turli <an...@gmail.com>
Authored: Mon Aug 28 09:27:01 2017 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Mon Aug 28 09:27:01 2017 +0200
----------------------------------------------------------------------
.../jclouds/StubbedComputeServiceRegistry.java | 26 ++++++++++++++++----
1 file changed, 21 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ac5568d8/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
index e8570ea..4e8e8a6 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/StubbedComputeServiceRegistry.java
@@ -37,16 +37,18 @@ import org.jclouds.domain.LoginCredentials;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
public class StubbedComputeServiceRegistry implements ComputeServiceRegistry {
- public static interface NodeCreator {
- public Set<? extends NodeMetadata> createNodesInGroup(String group, int count, Template template) throws RunNodesException;
- public void destroyNode(String id);
- public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<? super NodeMetadata> filter);
- public NodeMetadata getCreatedNode(String nodeId);
+ public interface NodeCreator {
+ Set<? extends NodeMetadata> createNodesInGroup(String group, int count, Template template) throws RunNodesException;
+ void destroyNode(String id);
+ Set<? extends NodeMetadata> destroyNodesMatching(Predicate<? super NodeMetadata> filter);
+ Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<? super NodeMetadata> filter);
+ NodeMetadata getCreatedNode(String nodeId);
}
public static abstract class AbstractNodeCreator implements NodeCreator {
@@ -67,6 +69,14 @@ public class StubbedComputeServiceRegistry implements ComputeServiceRegistry {
public void destroyNode(String id) {
destroyed.add(id);
}
+
+ @Override
+ public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<? super NodeMetadata> filter) {
+ NodeMetadata only = Iterables.get(created, 0);
+ destroyed.add(only.getId());
+ return ImmutableSet.of(only);
+ }
+
@Override
public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<? super NodeMetadata> filter) {
return ImmutableSet.of();
@@ -169,6 +179,12 @@ public class StubbedComputeServiceRegistry implements ComputeServiceRegistry {
public void destroyNode(String id) {
nodeCreator.destroyNode(id);
}
+
+ @Override
+ public Set<? extends NodeMetadata> destroyNodesMatching(Predicate<? super NodeMetadata> filter) {
+ return nodeCreator.destroyNodesMatching(filter);
+ }
+
@Override
public Set<? extends NodeMetadata> listNodesDetailsMatching(Predicate<? super NodeMetadata> filter) {
return nodeCreator.listNodesDetailsMatching(filter);
[2/4] brooklyn-server git commit: modify killMachine as releaseNode
Posted by dr...@apache.org.
modify killMachine as releaseNode
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/233e2204
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/233e2204
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/233e2204
Branch: refs/heads/master
Commit: 233e220440a79235d77ba6cc1aab575d6e296dba
Parents: 53c0d44
Author: Andrea Turli <an...@gmail.com>
Authored: Fri Aug 25 18:14:40 2017 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Fri Aug 25 18:14:40 2017 +0200
----------------------------------------------------------------------
.../org/apache/brooklyn/location/jclouds/JcloudsLocation.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/233e2204/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
index 8d32b2f..a914847 100644
--- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java
@@ -522,7 +522,9 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
@Override
public void killMachine(String cloudServiceId) {
- getComputeService().destroyNode(cloudServiceId);
+ // FIXME revert to computeService.destroyNode(cloudServiceId); once JCLOUDS-1332 gets fixed
+ Set<? extends NodeMetadata> destroyed = getComputeService().destroyNodesMatching(withIds(cloudServiceId));
+ LOG.debug("Destroyed nodes %s%n", destroyed);
}
@Override