Browse Source

Merge "Set DB retry for quota_enforcement pecan_wsgi hook"

changes/74/691874/13
Zuul 2 weeks ago
parent
commit
541c59a630
2 changed files with 1 additions and 5 deletions
  1. +1
    -0
      neutron/pecan_wsgi/hooks/quota_enforcement.py
  2. +0
    -5
      neutron/quota/resource_registry.py

+ 1
- 0
neutron/pecan_wsgi/hooks/quota_enforcement.py View File

@@ -61,6 +61,7 @@ class QuotaEnforcementHook(hooks.PecanHook):
# retrieved in the 'after' hook
state.request.context['reservations'] = reservations

@db_api.retry_db_errors
def after(self, state):
neutron_context = state.request.context.get('neutron_context')
if not neutron_context:

+ 0
- 5
neutron/quota/resource_registry.py View File

@@ -61,11 +61,6 @@ def set_resources_dirty(context):
dirty status is True, sets the dirty bit to True in the database
for the appropriate tenants.

Please note that this routine begins a nested transaction, and it
is not recommended that this transaction begins within another
transaction. For this reason the function will raise a SqlAlchemy
exception if such an attempt is made.

:param context: a Neutron request context with a DB session
"""
if not cfg.CONF.QUOTAS.track_quota_usage:

Loading…
Cancel
Save