openstack/deb-nova
Code Issues Proposed changes

Merge same db calls for some quota methods

Browse Source 
db.quota_get_all_by_project is called twice in method limit_check()
and reserve(),
db.quota_get_all_by_project_and_user is called twice in method
get_settable_quotas() in nova/quota.py

Change-Id: Ie5e3a414d3d52964c16613f44fe60a7f68bc0c66
Closes-bug: 1277068
This commit is contained in:
liyingjun
2014-01-15 00:34:07 +08:00
parent 816dc4bfd2
commit 67582831e2
2 changed files with 47 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
nova/quota.py
View File

@@ -198,7 +198,8 @@ class DbQuotaDriver(object):
def get_user_quotas(self, context, resources, project_id, user_id,
quota_class=None, defaults=True,
usages=True):
usages=True, project_quotas=None,
user_quotas=None):
"""
Given a list of resources, retrieve the quotas for the given
user and project.
@@ -218,11 +219,15 @@ class DbQuotaDriver(object):
specific value for the resource.
:param usages: If True, the current in_use and reserved counts
will also be returned.
:param project_quotas: Quotas dictionary for the specified project.
:param user_quotas: Quotas dictionary for the specified project
and user.
"""
user_quotas = db.quota_get_all_by_project_and_user(context,
project_id, user_id)
user_quotas = user_quotas or db.quota_get_all_by_project_and_user(
context, project_id, user_id)
# Use the project quota for default user quota.
proj_quotas = db.quota_get_all_by_project(context, project_id)
proj_quotas = project_quotas or db.quota_get_all_by_project(
context, project_id)
for key, value in proj_quotas.iteritems():
if key not in user_quotas.keys():
user_quotas[key] = value
@@ -237,7 +242,7 @@ class DbQuotaDriver(object):
def get_project_quotas(self, context, resources, project_id,
quota_class=None, defaults=True,
usages=True, remains=False):
usages=True, remains=False, project_quotas=None):
"""
Given a list of resources, retrieve the quotas for the given
project.
@@ -258,8 +263,10 @@ class DbQuotaDriver(object):
will also be returned.
:param remains: If True, the current remains of the project will
will be returned.
:param project_quotas: Quotas dictionary for the specified project.
"""
project_quotas = db.quota_get_all_by_project(context, project_id)
project_quotas = project_quotas or db.quota_get_all_by_project(
context, project_id)
project_usages = None
if usages:
project_usages = db.quota_usage_get_all_by_project(context,
@@ -281,14 +288,18 @@ class DbQuotaDriver(object):
:param user_id: The ID of the user to return quotas for.
"""
settable_quotas = {}
db_proj_quotas = db.quota_get_all_by_project(context, project_id)
project_quotas = self.get_project_quotas(context, resources,
project_id, remains=True)
project_id, remains=True,
project_quotas=db_proj_quotas)
if user_id:
user_quotas = self.get_user_quotas(context, resources,
project_id, user_id)
setted_quotas = db.quota_get_all_by_project_and_user(context,
project_id,
user_id)
user_quotas = self.get_user_quotas(context, resources,
project_id, user_id,
project_quotas=db_proj_quotas,
user_quotas=setted_quotas)
for key, value in user_quotas.items():
maximum = project_quotas[key]['remains'] +\
setted_quotas.get(key, 0)
@@ -304,7 +315,7 @@ class DbQuotaDriver(object):
return settable_quotas
def _get_quotas(self, context, resources, keys, has_sync, project_id=None,
user_id=None):
user_id=None, project_quotas=None):
"""
A helper method which retrieves the quotas for the specific
resources identified by keys, and which apply to the current
@@ -323,6 +334,7 @@ class DbQuotaDriver(object):
:param user_id: Specify the user_id if current context
is admin and admin wants to impact on
common user.
:param project_quotas: Quotas dictionary for the specified project.
"""
# Filter resources
@@ -343,13 +355,15 @@ class DbQuotaDriver(object):
# Grab and return the quotas (without usages)
quotas = self.get_user_quotas(context, sub_resources,
project_id, user_id,
context.quota_class, usages=False)
context.quota_class, usages=False,
project_quotas=project_quotas)
else:
# Grab and return the quotas (without usages)
quotas = self.get_project_quotas(context, sub_resources,
project_id,
context.quota_class,
usages=False)
usages=False,
project_quotas=project_quotas)
return dict((k, v['limit']) for k, v in quotas.items())
@@ -395,11 +409,14 @@ class DbQuotaDriver(object):
user_id = context.user_id
# Get the applicable quotas
project_quotas = db.quota_get_all_by_project(context, project_id)
quotas = self._get_quotas(context, resources, values.keys(),
has_sync=False, project_id=project_id)
has_sync=False, project_id=project_id,
project_quotas=project_quotas)
user_quotas = self._get_quotas(context, resources, values.keys(),
has_sync=False, project_id=project_id,
user_id=user_id)
user_id=user_id,
project_quotas=project_quotas)
# Check the quotas and construct a list of the resources that
# would be put over limit by the desired values
@@ -481,11 +498,14 @@ class DbQuotaDriver(object):
# NOTE(Vek): We're not worried about races at this point.
# Yes, the admin may be in the process of reducing
# quotas, but that's a pretty rare thing.
project_quotas = db.quota_get_all_by_project(context, project_id)
quotas = self._get_quotas(context, resources, deltas.keys(),
has_sync=True, project_id=project_id)
has_sync=True, project_id=project_id,
project_quotas=project_quotas)
user_quotas = self._get_quotas(context, resources, deltas.keys(),
has_sync=True, project_id=project_id,
user_id=user_id)
user_id=user_id,
project_quotas=project_quotas)
# NOTE(Vek): Most of the work here has to be done in the DB
# API, because we have to do it in a transaction,

17
nova/tests/test_quota.py
View File

@@ -1585,7 +1585,8 @@ class DbQuotaDriverTestCase(test.TestCase):
def _stub_get_settable_quotas(self):
def fake_get_project_quotas(context, resources, project_id,
quota_class=None, defaults=True,
usages=True, remains=False):
usages=True, remains=False,
project_quotas=None):
self.calls.append('get_project_quotas')
result = {}
for k, v in resources.items():
@@ -1601,7 +1602,8 @@ class DbQuotaDriverTestCase(test.TestCase):
def fake_get_user_quotas(context, resources, project_id, user_id,
quota_class=None, defaults=True,
usages=True):
usages=True, project_quotas=None,
user_quotas=None):
self.calls.append('get_user_quotas')
result = {}
for k, v in resources.items():
@@ -1632,8 +1634,8 @@ class DbQuotaDriverTestCase(test.TestCase):
self.assertEqual(self.calls, [
'get_project_quotas',
'get_user_quotas',
'quota_get_all_by_project_and_user',
'get_user_quotas',
])
self.assertEqual(result, {
'instances': {
@@ -1749,7 +1751,8 @@ class DbQuotaDriverTestCase(test.TestCase):
def _stub_get_project_quotas(self):
def fake_get_project_quotas(context, resources, project_id,
quota_class=None, defaults=True,
usages=True, remains=False):
usages=True, remains=False,
project_quotas=None):
self.calls.append('get_project_quotas')
return dict((k, dict(limit=v.default))
for k, v in resources.items())
@@ -1796,7 +1799,8 @@ class DbQuotaDriverTestCase(test.TestCase):
quota.QUOTAS._resources,
['instances', 'cores', 'ram',
'floating_ips', 'security_groups'],
True)
True,
project_id='test_project')
self.assertEqual(self.calls, ['get_project_quotas'])
self.assertEqual(result, dict(
@@ -1815,7 +1819,8 @@ class DbQuotaDriverTestCase(test.TestCase):
['metadata_items', 'injected_files',
'injected_file_content_bytes',
'injected_file_path_bytes',
'security_group_rules'], False)
'security_group_rules'], False,
project_id='test_project')
self.assertEqual(self.calls, ['get_project_quotas'])
self.assertEqual(result, dict(