openstack
/
cinder
Code Issues Proposed changes

Add an optional db session argument to cinder.db.sqlalchemy.api. 

quota_allocated_get_all_by_project(). Then in quota_reserve()
pass the session that is fetched for that method so that a new
session does not have to be made. This can avoid DB timeouts
and retries when a lot of concurrent operations are hitting
quota_reserve().

Added session to method mocking in the UT cases and removed a
mocking instance that was dead code since it was already mocked
in the specific tests needed.

Change-Id: I43b5035926eb8b65e7913ac0a8c58e6b9ebb5619
Closes-Bug: #1676574
This commit is contained in:
Carl Pecinovsky 2017-03-30 09:12:21 -04:00
parent 56ac735910
commit 25d6d0848c
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cinder/db/sqlalchemy/api.py
View File

@ -837,9 +837,9 @@ def quota_get_all_by_project(context, project_id):
@require_context
def quota_allocated_get_all_by_project(context, project_id):
rows = model_query(context, models.Quota, read_deleted='no').filter_by(
project_id=project_id).all()
def quota_allocated_get_all_by_project(context, project_id, session=None):
rows = model_query(context, models.Quota, read_deleted='no',
session=session).filter_by(project_id=project_id).all()
result = {'project_id': project_id}
for row in rows:
result[row.resource] = row.allocated
@ -1138,7 +1138,8 @@ def quota_reserve(context, resources, quotas, deltas, expire,
# Get the current usages
usages = _get_quota_usages(context, session, project_id)
allocated = quota_allocated_get_all_by_project(context, project_id)
allocated = quota_allocated_get_all_by_project(context, project_id,
session=session)
allocated.pop('project_id')
# Handle usage refresh

15
cinder/tests/unit/test_quota.py
View File

@ -952,7 +952,7 @@ class DbQuotaDriverBaseTestCase(test.TestCase):
self.mock_object(db, 'quota_class_get_all_by_name', fake_qcgabn)
def _mock_allocated_get_all_by_project(self, allocated_quota=False):
def fake_qagabp(context, project_id):
def fake_qagabp(context, project_id, session=None):
self.calls.append('quota_allocated_get_all_by_project')
if allocated_quota:
return dict(project_id=project_id, volumes=3)
@ -1559,7 +1559,8 @@ class NestedQuotaValidation(NestedDbQuotaDriverBaseTestCase):
def _fake_quota_usage_get_all_by_project(self, context, project_id):
return {'volumes': self.proj_vals[project_id]}
def _fake_quota_allocated_get_all_by_project(self, context, project_id):
def _fake_quota_allocated_get_all_by_project(self, context, project_id,
session=None):
ret = {'project_id': project_id}
proj_val = self.proj_vals[project_id]
if 'alloc' in proj_val:
@ -1735,12 +1736,6 @@ class QuotaReserveSqlAlchemyTestCase(test.TestCase):
return reservation_ref
def fake_qagabp(context, project_id):
self.assertEqual('test_project', project_id)
return {'project_id': project_id}
self.mock_object(sqa_api, 'quota_allocated_get_all_by_project',
fake_qagabp)
self.mock_object(sqa_api, 'get_session',
fake_get_session)
self.mock_object(sqa_api, '_get_quota_usages',
@ -1829,8 +1824,9 @@ class QuotaReserveSqlAlchemyTestCase(test.TestCase):
self.assertEqual(0, len(reservations))
def _mock_allocated_get_all_by_project(self, allocated_quota=False):
def fake_qagabp(context, project_id):
def fake_qagabp(context, project_id, session=None):
self.assertEqual('test_project', project_id)
self.assertNotEqual(session, None)
if allocated_quota:
return dict(project_id=project_id, volumes=3,
gigabytes = 2 * 1024)
@ -1861,6 +1857,7 @@ class QuotaReserveSqlAlchemyTestCase(test.TestCase):
dict(resource='gigabytes',
usage_id=self.usages_created['gigabytes'],
delta=2 * 1024), ])
# But if we try reserve 8 volumes(more free quota that we have)
deltas = dict(volumes=8,
gigabytes=2 * 1024, )