openstack
/
cinder
Code Issues Proposed changes

Merge "attach_volume first check for existing attachment"

This commit is contained in:
Jenkins 2017-05-24 04:19:21 +00:00 committed by Gerrit Code Review
parent 40ef04d642 a4305884e5
commit 7b304ce4aa
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/volume/test_connection.py
View File

@ -279,6 +279,12 @@ class VolumeAttachDetachTestCase(base.BaseVolumeTestCase):
instance_uuid, None,
mountpoint, 'ro',
volume=volume_passed)
attachment2 = self.volume.attach_volume(self.user_context,
volume_id,
instance_uuid, None,
mountpoint, 'ro',
volume=volume_passed)
self.assertEqual(attachment.id, attachment2.id)
vol = objects.Volume.get_by_id(self.context, volume_id)
self.assertEqual("in-use", vol.status)
self.assertEqual(fields.VolumeAttachStatus.ATTACHED,

10
cinder/volume/manager.py
View File

@ -1013,11 +1013,6 @@ class VolumeManager(manager.CleanableManager,
raise exception.InvalidVolume(
reason=_("being attached by different mode"))
if (volume.status == 'in-use' and not volume.multiattach
and not volume.migration_status):
raise exception.InvalidVolume(
reason=_("volume is already attached"))
host_name_sanitized = utils.sanitize_hostname(
host_name) if host_name else None
if instance_uuid:
@ -1036,6 +1031,11 @@ class VolumeManager(manager.CleanableManager,
volume.save()
return attachment
if (volume.status == 'in-use' and not volume.multiattach
and not volume.migration_status):
raise exception.InvalidVolume(
reason=_("volume is already attached"))
self._notify_about_volume_usage(context, volume,
"attach.start")