openstack
/
puppet-tripleo
Code Issues Proposed changes

Retry ceilometer-upgrade 

When the ceilometer-upgrade command is run in step5, it talks to gnocchi
and keystone on all the controllers. Since these other nodes might have
httpd restarted mid-upgrade we should retry if we get a failure.

Change-Id: I874cf9c34b41d055a258704dabe9150eab0f7968
Closes-Bug: #1703444
This commit is contained in:
Alex Schultz 2017-07-11 15:14:00 -06:00 committed by Emilien Macchi
parent 9c49a5c39a
commit 661757a16f
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/profile/base/ceilometer/upgrade.pp
View File

@ -42,8 +42,16 @@ class tripleo::profile::base::ceilometer::upgrade (
# are created safely.
if $step >= 5 and $sync_db {
exec {'ceilometer-db-upgrade':
command => 'ceilometer-upgrade --skip-metering-database',
path => ['/usr/bin', '/usr/sbin'],
command => 'ceilometer-upgrade --skip-metering-database',
path => ['/usr/bin', '/usr/sbin'],
# LP#1703444 - When this runs, it talks to gnocchi on all controllers
# which then reaches out to keystone via haproxy. Since the deployment
# may restart httpd on these other nodes it can result in an intermittent
# 503 which fails this command. We should retry the upgrade in case of
# error since we cannot ensure that there might not be some other deploy
# process running on the other nodes.
try_sleep => 5,
tries => 10
}
}
}