diff options
| author | Kevin_Zheng <zhengzhenyu@huawei.com> | 2015-08-17 10:32:23 +0800 |
|---|---|---|
| committer | Kevin_Zheng <zhengzhenyu@huawei.com> | 2015-08-29 10:54:14 +0800 |
| commit | 6f35a8429939ec0f80deb2a65050c4b56db79545 (patch) | |
| tree | 5cc740c374b1bcf4c10b73165b6b66f0de5ed693 /nova/db | |
| parent | e81593b8c2ecf0ad5fab92bca8ac13e6c1d09daa (diff) | |
| download | nova-6f35a8429939ec0f80deb2a65050c4b56db79545.tar.gz | |
Make query to quota usage table order preserved
Currently, the query to quota usage table is not order
preserved. This might cause deadlock in large-scale
deployment: different calls may lock rows in different
order, and deadlock will happen.
This patch adds order_by to the query and make the query
to the table order preserved.
Change-Id: I98f6d7c3141349326c43cb32adcc1e6485ad53a6
Closes-bug: #1485408
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index 85dd127a77..6709d35718 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -3367,9 +3367,10 @@ def _get_project_user_quota_usages(context, session, project_id, rows = model_query(context, models.QuotaUsage, read_deleted="no", session=session).\ - filter_by(project_id=project_id).\ - with_lockmode('update').\ - all() + filter_by(project_id=project_id).\ + order_by(models.QuotaUsage.id.asc()).\ + with_lockmode('update').\ + all() proj_result = dict() user_result = dict() # Get the total count of in_use,reserved |