diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-20 20:57:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-20 20:57:39 +0000 |
| commit | 922f539a67b8bc406085feb62f7756f735469f74 (patch) | |
| tree | 26a152a227ef50f1ecb93d8f89d6a5a73815c52f /nova/db | |
| parent | cc8eb0d93b69ceee9703c591a2ad65348d48de2f (diff) | |
| parent | 23e5036fbaf4ae9622027b129a6cd209029e52e5 (diff) | |
| download | nova-922f539a67b8bc406085feb62f7756f735469f74.tar.gz | |
Merge "Count floating ips to check quota"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index cb9d4036d9..3d2ad0312e 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -66,7 +66,6 @@ import nova.context from nova.db.sqlalchemy import models from nova import exception from nova.i18n import _, _LI, _LE, _LW -from nova import quota from nova import safe_utils profiler_sqlalchemy = importutils.try_import('osprofiler.sqlalchemy') @@ -1001,20 +1000,6 @@ def floating_ip_bulk_destroy(context, ips): filter(models.FloatingIp.address.in_(ip_block)).\ soft_delete(synchronize_session='fetch') - # Delete the quotas, if needed. - # Quota update happens in a separate transaction, so previous must have - # been committed first. - for project_id, count in project_id_to_quota_count.items(): - try: - reservations = quota.QUOTAS.reserve(context, - project_id=project_id, - floating_ips=count) - quota.QUOTAS.commit(context, reservations, project_id=project_id) - except Exception: - with excutils.save_and_reraise_exception(): - LOG.exception(_LE("Failed to update usages bulk " - "deallocating floating IP")) - @require_context @pick_context_manager_writer |