openstack/cinder
Code Issues Proposed changes

Merge "Enable trim/discard in SolidFire's driver"

Browse Source
This commit is contained in:
Jenkins 2016-01-14 06:24:21 +00:00 committed by Gerrit Code Review
commit aa44c8b281
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cinder/tests/unit/test_solidfire.py
View File

@ -445,6 +445,7 @@ class SolidFireVolumeTestCase(test.TestCase):
properties = sfv.initialize_connection(testvol, connector) properties = sfv.initialize_connection(testvol, connector)
self.assertEqual('4096', properties['data']['physical_block_size']) self.assertEqual('4096', properties['data']['physical_block_size'])
self.assertEqual('4096', properties['data']['logical_block_size']) self.assertEqual('4096', properties['data']['logical_block_size'])
self.assertTrue(properties['data']['discard'])
def test_create_volume_fails(self): def test_create_volume_fails(self):
# NOTE(JDG) This test just fakes update_cluster_status # NOTE(JDG) This test just fakes update_cluster_status

8
cinder/volume/drivers/solidfire.py
View File

@ -1425,9 +1425,11 @@ class SolidFireDriver(san.SanISCSIDriver):
Optionally checks and utilizes volume access groups. Optionally checks and utilizes volume access groups.
""" """
return self._sf_initialize_connection(volume, properties = self._sf_initialize_connection(volume,
connector, connector,
initiator_data) initiator_data)
properties['data']['discard'] = True
return properties
def attach_volume(self, context, volume, def attach_volume(self, context, volume,
instance_uuid, host_name, instance_uuid, host_name,