openstack/nova
Code Issues Proposed changes

Merge "neutron: refactor nw info cache refresh out of associate_floating_ip"

Browse Source
This commit is contained in:
Zuul 2019-09-05 20:43:24 +00:00 committed by Gerrit Code Review
commit 86b6906ff4
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
nova/network/neutronv2/api.py
View File

@ -2331,22 +2331,42 @@ class API(base_api.NetworkAPI):
except neutron_client_exc.Conflict as e: except neutron_client_exc.Conflict as e:
raise exception.FloatingIpAssociateFailed(six.text_type(e)) raise exception.FloatingIpAssociateFailed(six.text_type(e))
# If the floating IP was associated with another server, try to refresh
# the cache for that instance to avoid a window of time where multiple
# servers in the API say they are using the same floating IP.
if fip['port_id']: if fip['port_id']:
port = self._show_port(context, fip['port_id'], # TODO(mriedem): Seems we should trap and log any errors from
neutron_client=client) # _update_inst_info_cache_for_disassociated_fip but not let them
orig_instance_uuid = port['device_id'] # raise back up to the caller since this refresh is best effort.
self._update_inst_info_cache_for_disassociated_fip(
context, instance, client, fip)
msg_dict = dict(address=floating_address, def _update_inst_info_cache_for_disassociated_fip(self, context,
instance_id=orig_instance_uuid) instance, client, fip):
LOG.info('re-assign floating IP %(address)s from ' """Update the network info cache when a floating IP is re-assigned.
'instance %(instance_id)s', msg_dict,
instance=instance)
orig_instance = objects.Instance.get_by_uuid(context,
orig_instance_uuid)
# purge cached nw info for the original instance :param context: nova auth RequestContext
base_api.update_instance_cache_with_nw_info(self, context, :param instance: The instance to which the floating IP is now assigned
orig_instance) :param client: ClientWrapper instance for using the Neutron API
:param fip: dict for the floating IP that was re-assigned where the
the ``port_id`` value represents the port that was
associated with another server.
"""
port = self._show_port(context, fip['port_id'],
neutron_client=client)
orig_instance_uuid = port['device_id']
msg_dict = dict(address=fip['floating_ip_address'],
instance_id=orig_instance_uuid)
LOG.info('re-assign floating IP %(address)s from '
'instance %(instance_id)s', msg_dict,
instance=instance)
orig_instance = objects.Instance.get_by_uuid(context,
orig_instance_uuid)
# purge cached nw info for the original instance
base_api.update_instance_cache_with_nw_info(self, context,
orig_instance)
def get_all(self, context): def get_all(self, context):
"""Get all networks for client.""" """Get all networks for client."""