You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by an...@apache.org on 2015/07/03 13:30:20 UTC
jclouds git commit: [JCLOUDS-956] synchronizing
allocateFloatingIPForNode helps
Repository: jclouds
Updated Branches:
refs/heads/master 41d598b03 -> 82da165fd
[JCLOUDS-956] synchronizing allocateFloatingIPForNode helps
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/82da165f
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/82da165f
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/82da165f
Branch: refs/heads/master
Commit: 82da165fdd7afc63b31e7c95a28d4a34b55054e7
Parents: 41d598b
Author: Andrea Turli <an...@gmail.com>
Authored: Fri Jul 3 12:34:26 2015 +0200
Committer: Andrea Turli <an...@gmail.com>
Committed: Fri Jul 3 13:29:54 2015 +0200
----------------------------------------------------------------------
.../v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/82da165f/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
index 4d7fba9..c1b07dd 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
@@ -19,7 +19,6 @@ package org.jclouds.openstack.nova.v2_0.compute.functions;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_RUNNING;
-
import java.util.Collections;
import java.util.List;
import java.util.Set;
@@ -87,6 +86,7 @@ public class AllocateAndAddFloatingIpToNode implements
logger.debug(">> adding floatingIp(%s) to node(%s)", ip.get().getIp(), node.getId());
floatingIpApi.addToServer(ip.get().getIp(), node.getProviderId());
+
input.get().getNodeMetadata().set(NodeMetadataBuilder.fromNodeMetadata(node).publicAddresses(ImmutableSet.of(ip.get().getIp())).build());
floatingIpCache.invalidate(RegionAndId.fromSlashEncoded(node.getId()));
return input.get().getNodeMetadata();
@@ -100,7 +100,7 @@ public class AllocateAndAddFloatingIpToNode implements
* @param nodeID optional id of the Node we are trying to allocate a FloatingIP for. Used here only for logging purposes
* @return Optional<FloatingIP>
*/
- private Optional<FloatingIP> allocateFloatingIPForNode(FloatingIPApi floatingIpApi, Optional<Set<String>> poolNames, String nodeID) {
+ private synchronized Optional<FloatingIP> allocateFloatingIPForNode(FloatingIPApi floatingIpApi, Optional<Set<String>> poolNames, String nodeID) {
FloatingIP ip = null;