Use timeout(1) to timeout gerrit user sync script

The gerrit user sync script is showing the same symptoms as the gerrit
hook scripts when it comes to hanging on a launchpad connection.
Timeout this script as well so that it can be run again instead of
perpetually doing nothing.

Change-Id: I8d44c6eac76f5820f28eb1723640ce4dac57413b
Reviewed-on: https://review.openstack.org/11503
Reviewed-by: James E. Blair <corvus@inaugust.com>
Approved: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Clark Boylan 2012-08-16 13:34:53 -07:00 committed by Jenkins
parent 9e8a187482
commit 6b127916bc

View File

@ -29,7 +29,7 @@ class launchpad_sync(
cron { "sync_launchpad_users": cron { "sync_launchpad_users":
user => $user, user => $user,
minute => "*/15", minute => "*/15",
command => "sleep $((RANDOM\\%60+60)) && python /usr/local/bin/update_gerrit_users.py ${script_user} ${script_key_file} ${site} ${root_team}", command => "sleep $((RANDOM\\%60+60)) && timeout -k 5m 65m python /usr/local/bin/update_gerrit_users.py ${script_user} ${script_key_file} ${site} ${root_team}",
require => File['/usr/local/bin/update_gerrit_users.py'], require => File['/usr/local/bin/update_gerrit_users.py'],
} }