openstack/cinder
Code Issues Proposed changes

Merge "ScaleIO extend volume round up capacity"

Browse Source
This commit is contained in:
Jenkins 2015-11-27 23:11:37 +00:00 committed by Gerrit Code Review
commit 78873c7f65
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cinder/tests/unit/volume/drivers/emc/scaleio/test_extend_volume.py
View File

@ -93,10 +93,7 @@ class TestExtendVolume(scaleio.TestScaleIODriver):
self.driver.configuration.set_override('sio_round_volume_capacity', self.driver.configuration.set_override('sio_round_volume_capacity',
override=False) override=False)
self.set_https_response_mode(self.RESPONSE_MODE.Valid) self.set_https_response_mode(self.RESPONSE_MODE.Valid)
self.assertRaises(exception.VolumeBackendAPIException, self.driver.extend_volume(self.volume, self.BAD_SIZE)
self.driver.extend_volume,
self.volume,
self.BAD_SIZE)
def test_extend_volume_bad_size_round(self): def test_extend_volume_bad_size_round(self):
self.driver.configuration.set_override('sio_round_volume_capacity', self.driver.configuration.set_override('sio_round_volume_capacity',

22
cinder/volume/drivers/emc/scaleio.py
View File

@ -522,10 +522,11 @@ class ScaleIODriver(driver.VolumeDriver):
return verify_cert return verify_cert
def extend_volume(self, volume, new_size): def extend_volume(self, volume, new_size):
"""Extends the size of an existing available ScaleIO volume.""" """Extends the size of an existing available ScaleIO volume.
self._check_volume_size(new_size)
This action will round up the volume to the nearest size that is
a granularity of 8 GBs.
"""
vol_id = volume['provider_id'] vol_id = volume['provider_id']
LOG.info(_LI( LOG.info(_LI(
"ScaleIO extend volume: volume %(volname)s to size %(new_size)s."), "ScaleIO extend volume: volume %(volname)s to size %(new_size)s."),
@ -539,7 +540,20 @@ class ScaleIODriver(driver.VolumeDriver):
"/api/instances/Volume::%(vol_id)s" "/api/instances/Volume::%(vol_id)s"
"/action/setVolumeSize") % req_vars "/action/setVolumeSize") % req_vars
LOG.info(_LI("Change volume capacity request: %s."), request) LOG.info(_LI("Change volume capacity request: %s."), request)
volume_new_size = new_size
# Round up the volume size so that it is a granularity of 8 GBs
# because ScaleIO only supports volumes with a granularity of 8 GBs.
if new_size % 8 == 0:
volume_new_size = new_size
else:
volume_new_size = new_size + 8 - (new_size % 8)
round_volume_capacity = self.configuration.sio_round_volume_capacity
if (not round_volume_capacity and not new_size % 8 == 0):
LOG.warning(_LW("ScaleIO only supports volumes with a granularity "
"of 8 GBs. The new volume size is: %d."),
volume_new_size)
params = {'sizeInGB': six.text_type(volume_new_size)} params = {'sizeInGB': six.text_type(volume_new_size)}
r = requests.post( r = requests.post(
request, request,