openstack/ironic
Code Issues Proposed changes

Remove overwriting the default value of db_max_retries.

Browse Source 
Remove overwriting the default value of db_max_retries, instead use
default value defined by oslo.db which is 20.
Adjust the default value of db_max_retries in the release note and sample
configuration file.

Closes-Bug: #1671629
Change-Id: I1e5f632d687c1cebab895cc91958d502b9fce884
This commit is contained in:
Joanna Taryma 2017-03-10 10:41:27 -08:00
parent e2e5340981
commit 66b0bcfd08
3 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/ironic/ironic.conf.sample
View File

@ -1251,7 +1251,7 @@
# Maximum retries in case of connection error or deadlock # Maximum retries in case of connection error or deadlock
# error before error is raised. Set to -1 to specify an # error before error is raised. Set to -1 to specify an
# infinite retry count. (integer value) # infinite retry count. (integer value)
#db_max_retries = 5 #db_max_retries = 20
[deploy] [deploy]

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.