openstack/manila
Code Issues Proposed changes

Fixes bug with simultaneous network modification

Browse Source 
There is problem with race condition in creation of service vm. If
several simultaneous requests appear, only first gets successful, other
fails.

Closes-bug: 1292736
Change-Id: I45040d91b4020b9a60dea7f78cf97790a44690f8
This commit is contained in:
Andrei V. Ostapenko 2014-03-15 09:07:36 +02:00
parent b4a4badfa5
commit e2bd55c23b
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
manila/share/drivers/service_instance.py
View File

@ -312,21 +312,23 @@ class ServiceInstanceManager(object):
share_network_id, old_server_ip):
"""Creates service vm and sets up networking for it."""
service_image_id = self._get_service_image(context)
with lock:
key_name = self._get_key(context)
if not CONF.service_instance_password and not key_name:
raise exception.ServiceInstanceException(
_('Neither service instance password nor key are available.'))
if not CONF.service_instance_password and not key_name:
raise exception.ServiceInstanceException(_('Neither service '
'instance password nor key are available.'))
port = self._setup_network_for_instance(context,
share_network_id,
old_server_ip)
try:
self._setup_connectivity_with_service_instances()
except Exception as e:
LOG.debug(e)
self.neutron_api.delete_port(port['id'])
raise
port = self._setup_network_for_instance(context,
share_network_id,
old_server_ip)
try:
self._setup_connectivity_with_service_instances()
except Exception as e:
LOG.debug(e)
self.neutron_api.delete_port(port['id'])
raise
service_instance = self.compute_api.server_create(context,
instance_name,
service_image_id,