brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drigod...@apache.org
Subject [2/4] brooklyn-server git commit: modify killMachine as releaseNode
Date Wed, 13 Sep 2017 11:17:38 GMT
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 <andrea.turli@gmail.com>
Authored: Fri Aug 25 18:14:40 2017 +0200
Committer: Andrea Turli <andrea.turli@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


Mime
View raw message