Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 87565200CFC for ; Wed, 13 Sep 2017 13:17:41 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 85F0C1609C9; Wed, 13 Sep 2017 11:17:41 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id CD21D1609CA for ; Wed, 13 Sep 2017 13:17:40 +0200 (CEST) Received: (qmail 5534 invoked by uid 500); 13 Sep 2017 11:17:39 -0000 Mailing-List: contact commits-help@brooklyn.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@brooklyn.apache.org Delivered-To: mailing list commits@brooklyn.apache.org Received: (qmail 4165 invoked by uid 99); 13 Sep 2017 11:17:37 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Sep 2017 11:17:37 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8685AF5743; Wed, 13 Sep 2017 11:17:37 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: drigodwin@apache.org To: commits@brooklyn.apache.org Date: Wed, 13 Sep 2017 11:17:38 -0000 Message-Id: In-Reply-To: <4aa796945fc14824aa83313ce7bbcea9@git.apache.org> References: <4aa796945fc14824aa83313ce7bbcea9@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/4] brooklyn-server git commit: modify killMachine as releaseNode archived-at: Wed, 13 Sep 2017 11:17:41 -0000 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 Authored: Fri Aug 25 18:14:40 2017 +0200 Committer: Andrea Turli 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 destroyed = getComputeService().destroyNodesMatching(withIds(cloudServiceId)); + LOG.debug("Destroyed nodes %s%n", destroyed); } @Override