diff options
author | Martin Kosek <mkosek@redhat.com> | 2013-01-15 16:33:22 +0100 |
---|---|---|
committer | Martin Kosek <mkosek@redhat.com> | 2013-01-15 16:36:04 +0100 |
commit | cab85b7c9a7e8b7c82915512f7d4718c4cbcbef9 (patch) | |
tree | f00c593f33089386697b0291cc37ccbf8c224909 | |
parent | 27e49f01fe3292e5da47c3d589fcab2637662a07 (diff) | |
download | freeipa.git-cab85b7c9a7e8b7c82915512f7d4718c4cbcbef9.tar.gz freeipa.git-cab85b7c9a7e8b7c82915512f7d4718c4cbcbef9.tar.xz freeipa.git-cab85b7c9a7e8b7c82915512f7d4718c4cbcbef9.zip |
Upgrade process should not crash on named restart
When either dirsrv or krb5kdc is down, named service restart in
ipa-upgradeconfig will fail and cause a crash of the whole upgrade
process.
Rather only report a failure to restart the service and continue
with the upgrade as it does not need the named service running. Do
the same precaution for pki-ca service restart.
https://fedorahosted.org/freeipa/ticket/3350
-rw-r--r-- | install/tools/ipa-upgradeconfig | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/install/tools/ipa-upgradeconfig b/install/tools/ipa-upgradeconfig index 0130fc14..f672bbd8 100644 --- a/install/tools/ipa-upgradeconfig +++ b/install/tools/ipa-upgradeconfig @@ -706,12 +706,19 @@ def main(): if changed_psearch or changed_autoincrement: # configuration has changed, restart the name server root_logger.info('Changes to named.conf have been made, restart named') - bindinstance.BindInstance(fstore).restart() + bind = bindinstance.BindInstance(fstore) + try: + bind.restart() + except ipautil.CalledProcessError, e: + root_logger.error("Failed to restart %s: %s", bind.service_name, e) ca_restart = ca_restart or enable_certificate_renewal(ca) or upgrade_ipa_profile(ca, api.env.domain, fqdn) if ca_restart: root_logger.info('pki-ca configuration changed, restart pki-ca') - ca.restart(dogtag.configured_constants().PKI_INSTANCE_NAME) + try: + ca.restart(dogtag.configured_constants().PKI_INSTANCE_NAME) + except ipautil.CalledProcessError, e: + root_logger.error("Failed to restart %s: %s", ca.service_name, e) if __name__ == '__main__': installutils.run_script(main, operation_name='ipa-upgradeconfig') |