openstack/cinder
Code Issues Proposed changes

Use project id from volume when retyping volumes

Browse Source 
Use the project_id from the volume being retyped to reserve quota in
get_volume_type_reservation(). Previously the project_id from the
context was used, which could cause reservations to be made and never
cleared.

Change-Id: I25f7c00961e259102cdaea6ea9394d04ded96b92
Closes-Bug: #1505307
This commit is contained in:
Ollie Leahy
2015-10-15 15:20:28 +00:00
parent 71932e9c4f
commit ceb65b6f86
3 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/quota_utils.py
View File

@@ -31,7 +31,14 @@ def get_volume_type_reservation(ctxt, volume, type_id):
QUOTAS.add_volume_type_opts(ctxt,
reserve_opts,
type_id)
reservations = QUOTAS.reserve(ctxt, **reserve_opts)
# Note that usually the project_id on the volume will be the same as
# the project_id in the context. But, if they are different then the
# reservations must be recorded against the project_id that owns the
# volume.
project_id = volume['project_id']
reservations = QUOTAS.reserve(ctxt,
project_id=project_id,
**reserve_opts)
except exception.OverQuota as e:
overs = e.kwargs['overs']
usages = e.kwargs['usages']