Merge "Make query to quota usage table order preserved"

2015-09-17 21:14:36 +00:00
parent 71a731de7c cac91bb8c8
commit b0cacb0826
1 changed files with 4 additions and 3 deletions
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -3373,9 +3373,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