openstack/shade
Code Issues Proposed changes

Merge "Fix race condition in deleting volumes"

Browse Source
This commit is contained in:
Jenkins 2016-03-22 21:27:22 +00:00 committed by Gerrit Code Review
commit 75c62a9fa6
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
shade/openstackcloud.py
View File

@ -24,6 +24,7 @@ from dogpile import cache
import requestsexceptions import requestsexceptions
import cinderclient.client import cinderclient.client
import cinderclient.exceptions as cinder_exceptions
import glanceclient import glanceclient
import glanceclient.exc import glanceclient.exc
import heatclient.client import heatclient.client
@ -2429,8 +2430,14 @@ class OpenStackCloud(object):
return False return False
with _utils.shade_exceptions("Error in deleting volume"): with _utils.shade_exceptions("Error in deleting volume"):
try:
self.manager.submitTask( self.manager.submitTask(
_tasks.VolumeDelete(volume=volume['id'])) _tasks.VolumeDelete(volume=volume['id']))
except cinder_exceptions.NotFound:
self.log.debug(
"Volume {id} not found when deleting. Ignoring.".format(
id=volume['id']))
return False
self.list_volumes.invalidate(self) self.list_volumes.invalidate(self)
if wait: if wait:

18
shade/tests/unit/test_volume.py
View File

@ -13,6 +13,7 @@
# under the License. # under the License.
import cinderclient.exceptions as cinder_exc
import mock import mock
import testtools import testtools
@ -188,3 +189,20 @@ class TestVolume(base.TestCase):
"Error in detaching volume %s" % errored_volume['id'] "Error in detaching volume %s" % errored_volume['id']
): ):
self.cloud.detach_volume(server, volume) self.cloud.detach_volume(server, volume)
@mock.patch.object(shade.OpenStackCloud, 'get_volume')
@mock.patch.object(shade.OpenStackCloud, 'cinder_client')
def test_delete_volume_deletes(self, mock_cinder, mock_get):
volume = dict(id='volume001', status='attached')
mock_get.side_effect = iter([volume, None])
self.assertTrue(self.cloud.delete_volume(volume['id']))
@mock.patch.object(shade.OpenStackCloud, 'get_volume')
@mock.patch.object(shade.OpenStackCloud, 'cinder_client')
def test_delete_volume_gone_away(self, mock_cinder, mock_get):
volume = dict(id='volume001', status='attached')
mock_get.side_effect = iter([volume])
mock_cinder.volumes.delete.side_effect = cinder_exc.NotFound('N/A')
self.assertFalse(self.cloud.delete_volume(volume['id']))