diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index 992efbb1a2..10326b4b4d 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -102,6 +102,11 @@ parameters: description: > Cron to move deleted instances to another table - Log destination default: '/var/log/cinder/cinder-rowsflush.log' + CinderCronDbPurgeMaxDelay: + type: string + description: > + Cron to move deleted instances to another table - Max Delay + default: '3600' NovaPassword: type: string description: The password for the nova service and db account @@ -147,6 +152,7 @@ outputs: cinder::cron::db_purge::user: {get_param: CinderCronDbPurgeUser} cinder::cron::db_purge::age: {get_param: CinderCronDbPurgeAge} cinder::cron::db_purge::destination: {get_param: CinderCronDbPurgeDestination} + cinder::cron::db_purge::max_delay: {get_param: CinderCronDbPurgeMaxDelay} cinder::glance::glance_api_servers: {get_param: [EndpointMap, GlanceInternal, uri]} cinder::nova::interface: admin cinder::nova::auth_type: password diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 3cb57faf4f..b511dee41f 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -123,6 +123,11 @@ parameters: description: > Cron to move deleted instances to another table - Week Day default: '*' + NovaCronDBArchivedMaxDelay: + type: string + description: > + Cron to move deleted instances to another table - Max Delay + default: '3600' NovaCronArchiveDeleteRowsMaxRows: type: string description: > @@ -243,6 +248,7 @@ outputs: nova::cron::archive_deleted_rows::monthday: {get_param: NovaCronArchiveDeleteRowsMonthday} nova::cron::archive_deleted_rows::month: {get_param: NovaCronArchiveDeleteRowsMonth} nova::cron::archive_deleted_rows::weekday: {get_param: NovaCronArchiveDeleteRowsWeekday} + nova::cron::archive_deleted_rows::maxdelay: {get_param: NovaCronDBArchivedMaxDelay} nova::cron::archive_deleted_rows::max_rows: {get_param: NovaCronArchiveDeleteRowsMaxRows} nova::cron::archive_deleted_rows::user: {get_param: NovaCronArchiveDeleteRowsUser} nova::cron::archive_deleted_rows::destination: {get_param: NovaCronArchiveDeleteRowsDestination} diff --git a/releasenotes/notes/bug-1823274-ca992c1055035c7b.yaml b/releasenotes/notes/bug-1823274-ca992c1055035c7b.yaml new file mode 100644 index 0000000000..fefae3df06 --- /dev/null +++ b/releasenotes/notes/bug-1823274-ca992c1055035c7b.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + New parameters, NovaCronDBArchivedMaxDelay and CinderCronDbPurgeMaxDelay, + are introduced to configure max_delay parameter to calculate randomized + sleep time before db archive/purge. This avoids db collisions when + performing db archive/purge operations on multiple controller nodes.