Run token flush cron job twice a day

Running the token flush once a day is seldom for larger deployments.
This changes the frequency to be twice a day instead of once.

Change-Id: Ia0b0fb422318712f4b0f4d023cbb3a61d40bb85d
Related-Bug: #1649616
This commit is contained in:
Juan Antonio Osorio Robles 2017-04-12 10:09:28 +03:00
parent f7d70a8334
commit bce06b24ac
6 changed files with 14 additions and 7 deletions

View File

@ -29,7 +29,7 @@
# (optional) Defaults to '1'.
#
# [*hour*]
# (optional) Defaults to '0'.
# (optional) Defaults to [0,12].
#
# [*monthday*]
# (optional) Defaults to '*'.
@ -56,7 +56,7 @@
class keystone::cron::token_flush (
$ensure = present,
$minute = 1,
$hour = 0,
$hour = [0,12],
$monthday = '*',
$month = '*',
$weekday = '*',

View File

@ -0,0 +1,7 @@
---
fixes:
- The token flush cron job has been modified to run twice a day instead of
once. This is because this was causing issues with larger deployments, as
the operation would take too long and sometimes even fail because of the
transaction being so large. Note that this only affects people using the
UUID token provider.

View File

@ -88,7 +88,7 @@ describe 'keystone server running with Apache/WSGI as Identity Provider' do
end
describe cron do
it { is_expected.to have_entry('1 0 * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
it { is_expected.to have_entry('1 0,12 * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
end
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v2 API' do |auth_creds|

View File

@ -86,7 +86,7 @@ describe 'keystone server running with Apache/WSGI as Service Provider with Shib
end
describe cron do
it { is_expected.to have_entry('1 0 * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
it { is_expected.to have_entry('1 0,12 * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
end
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v2 API' do |auth_creds|

View File

@ -82,7 +82,7 @@ describe 'keystone server running with Apache/WSGI with resources' do
end
describe cron do
it { is_expected.to have_entry('1 0 * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
it { is_expected.to have_entry('1 0,12 * * * keystone-manage token_flush >>/var/log/keystone/keystone-tokenflush.log 2>&1').with_user('keystone') }
end
shared_examples_for 'keystone user/tenant/service/role/endpoint resources using v2 API' do |auth_creds|

View File

@ -9,7 +9,7 @@ describe 'keystone::cron::token_flush' do
let :params do
{ :ensure => 'present',
:minute => 1,
:hour => 0,
:hour => [0,12],
:monthday => '*',
:month => '*',
:weekday => '*',
@ -71,7 +71,7 @@ describe 'keystone::cron::token_flush' do
:environment => 'PATH=/bin:/usr/bin:/usr/sbin SHELL=/bin/sh',
:user => 'keystonecustom',
:minute => 1,
:hour => 0,
:hour => [0,12],
:monthday => '*',
:month => '*',
:weekday => '*',