openstack/ironic
Code Issues Proposed changes

Merge "Remove overwriting the default value of db_max_retries."

Browse Source
This commit is contained in:
Jenkins 2017-03-13 10:58:25 +00:00 committed by Gerrit Code Review
commit 4f8afe8085
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ironic/conf/database.py
View File

@ -26,6 +26,3 @@ opts = [
def register_opts(conf): def register_opts(conf):
conf.register_opts(opts, group='database') conf.register_opts(opts, group='database')
# Change the oslo_db side default to 5
conf.import_opt('db_max_retries', 'ironic.db.api', group='database')
conf.set_default('db_max_retries', 5, group='database')

6
releasenotes/notes/add-db-deadlock-handling-6bc10076537f3727.yaml
View File

@ -5,10 +5,8 @@ fixes:
features: features:
- Adds DBDeadlock handling which may improve stability when using Galera. - Adds DBDeadlock handling which may improve stability when using Galera.
See https://bugs.launchpad.net/ironic/+bug/1639338. Number of retries See https://bugs.launchpad.net/ironic/+bug/1639338. Number of retries
depends on the configuration option ``[database]db_max_retries`` which depends on the configuration option ``[database]db_max_retries``.
programmatically defaults to 5.
upgrade: upgrade:
- All DB API methods doing database writes now retry on deadlock. The - All DB API methods doing database writes now retry on deadlock. The
``[database]db_max_retries`` configuration option specifies the maximum ``[database]db_max_retries`` configuration option specifies the maximum
number of times to retry, and can be customised if necessary. It is 5 by number of times to retry, and can be customised if necessary.
default.