openstack/cinder
Code Issues Proposed changes

Merge "Handle OverQuota exception during volume transfer"

Browse Source
This commit is contained in:
Jenkins 2016-02-29 03:14:13 +00:00 committed by Gerrit Code Review
commit 23268a686d
2 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cinder/tests/unit/test_volume_transfer.py
View File

@ -178,6 +178,36 @@ class VolumeTransferTestCase(test.TestCase):
mock.call(mock.ANY, project_id='project_id', **release_opt)] mock.call(mock.ANY, project_id='project_id', **release_opt)]
mock_quota_reserve.assert_has_calls(calls) mock_quota_reserve.assert_has_calls(calls)
@mock.patch.object(QUOTAS, "reserve")
@mock.patch.object(QUOTAS, "add_volume_type_opts")
@mock.patch('cinder.volume.utils.notify_about_volume_usage')
def test_transfer_accept_over_quota(self, mock_notify, mock_quota_voltype,
mock_quota_reserve):
svc = self.start_service('volume', host='test_host')
self.addCleanup(svc.stop)
tx_api = transfer_api.API()
volume = utils.create_volume(self.ctxt, volume_type_id='12345',
updated_at=self.updated_at)
transfer = tx_api.create(self.ctxt, volume.id, 'Description')
fake_overs = ['volumes_lvmdriver-3']
fake_quotas = {'gigabytes_lvmdriver-3': 1,
'volumes_lvmdriver-3': 10}
fake_usages = {'gigabytes_lvmdriver-3': {'reserved': 0, 'in_use': 1},
'volumes_lvmdriver-3': {'reserved': 0, 'in_use': 1}}
mock_quota_reserve.side_effect = exception.OverQuota(
overs=fake_overs,
quotas=fake_quotas,
usages=fake_usages)
self.ctxt.user_id = 'new_user_id'
self.ctxt.project_id = 'new_project_id'
self.assertRaises(exception.VolumeLimitExceeded,
tx_api.accept,
self.ctxt,
transfer['id'],
transfer['auth_key'])
def test_transfer_get(self): def test_transfer_get(self):
tx_api = transfer_api.API() tx_api = transfer_api.API()
volume = utils.create_volume(self.ctxt, updated_at=self.updated_at) volume = utils.create_volume(self.ctxt, updated_at=self.updated_at)

19
cinder/transfer/api.py
View File

@ -184,25 +184,28 @@ class API(base.Base):
def _consumed(name): def _consumed(name):
return (usages[name]['reserved'] + usages[name]['in_use']) return (usages[name]['reserved'] + usages[name]['in_use'])
if 'gigabytes' in overs: for over in overs:
if 'gigabytes' in over:
msg = _LW("Quota exceeded for %(s_pid)s, tried to create " msg = _LW("Quota exceeded for %(s_pid)s, tried to create "
"%(s_size)sG volume (%(d_consumed)dG of " "%(s_size)sG volume (%(d_consumed)dG of "
"%(d_quota)dG already consumed)") "%(d_quota)dG already consumed)")
LOG.warning(msg, {'s_pid': context.project_id, LOG.warning(msg, {'s_pid': context.project_id,
's_size': vol_ref['size'], 's_size': vol_ref['size'],
'd_consumed': _consumed('gigabytes'), 'd_consumed': _consumed(over),
'd_quota': quotas['gigabytes']}) 'd_quota': quotas[over]})
raise exception.VolumeSizeExceedsAvailableQuota( raise exception.VolumeSizeExceedsAvailableQuota(
requested=vol_ref['size'], requested=vol_ref['size'],
consumed=_consumed('gigabytes'), consumed=_consumed(over),
quota=quotas['gigabytes']) quota=quotas[over])
elif 'volumes' in overs: elif 'volumes' in over:
msg = _LW("Quota exceeded for %(s_pid)s, tried to create " msg = _LW("Quota exceeded for %(s_pid)s, tried to create "
"volume (%(d_consumed)d volumes " "volume (%(d_consumed)d volumes "
"already consumed)") "already consumed)")
LOG.warning(msg, {'s_pid': context.project_id, LOG.warning(msg, {'s_pid': context.project_id,
'd_consumed': _consumed('volumes')}) 'd_consumed': _consumed(over)})
raise exception.VolumeLimitExceeded(allowed=quotas['volumes']) raise exception.VolumeLimitExceeded(allowed=quotas[over],
name=over)
try: try:
donor_id = vol_ref['project_id'] donor_id = vol_ref['project_id']
reserve_opts = {'volumes': -1, 'gigabytes': -vol_ref.size} reserve_opts = {'volumes': -1, 'gigabytes': -vol_ref.size}