Enable trim/discard in SolidFire's driver

Pretty straight forward change to set a flag in the connection info
returned from initialize_connection. This change will work pending
upcoming Nova code reviews, as trim/discard support has been supported
by SolidFire since its inception.

Followed the Cinder Liberty spec titled
'cinder-backend-report-discard' for this change.

Change-Id: I667bb27cf4be7cfe7d403c9603c40bf20db9491e

diff --git a/cinder/tests/unit/test_solidfire.py b/cinder/tests/unit/test_solidfire.py
index bf65402e8447b973477dac5cb1572c0661647f95..81ebdf64288759b3564c02ddc4b5dd2a15b9d71a 100644 (file)
--- a/cinder/tests/unit/test_solidfire.py
+++ b/cinder/tests/unit/test_solidfire.py
@@ -444,6 +444,7 @@ class SolidFireVolumeTestCase(test.TestCase):
         properties = sfv.initialize_connection(testvol, connector)
         self.assertEqual('4096', properties['data']['physical_block_size'])
         self.assertEqual('4096', properties['data']['logical_block_size'])
+        self.assertTrue(properties['data']['discard'])
 
     def test_create_volume_fails(self):
         # NOTE(JDG) This test just fakes update_cluster_status

diff --git a/cinder/volume/drivers/solidfire.py b/cinder/volume/drivers/solidfire.py
index 3a6745a063ce9f2514bfd560ecaf90374f405fc1..7d4a61e8135bf9e5da3f4e10780b8f9fa1384f8f 100644 (file)
--- a/cinder/volume/drivers/solidfire.py
+++ b/cinder/volume/drivers/solidfire.py
@@ -1254,9 +1254,11 @@ class SolidFireDriver(san.SanISCSIDriver):
 
            Optionally checks and utilizes volume access groups.
         """
-        return self._sf_initialize_connection(volume,
-                                              connector,
-                                              initiator_data)
+        properties = self._sf_initialize_connection(volume,
+                                                    connector,
+                                                    initiator_data)
+        properties['data']['discard'] = True
+        return properties
 
     def attach_volume(self, context, volume,
                       instance_uuid, host_name,