IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-28 01:41:14 -06:00
Code Issues Packages Projects Releases Wiki Activity

upgradeinstance: Restore listeners on failure

Browse Source 
Allow running some installation after failure,
and use this for the upgradeinstance cleanup steps.

https://fedorahosted.org/freeipa/ticket/4499

Reviewed-By: Martin Kosek <mkosek@redhat.com>
This commit is contained in:
Petr Viktorin 2014-08-22 14:22:06 +02:00 committed by Martin Kosek
parent f3b1471af9
commit 9a188607fc
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ipaserver/install/service.py
View File

@ -23,6 +23,7 @@ import tempfile
import pwd
import time
import datetime
import traceback
from ipapython import sysrestore, ipautil, dogtag, ipaldap
from ipapython.dn import DN
@ -329,8 +330,8 @@ class Service(object):
def print_msg(self, message):
print_msg(message, self.output_fd)
def step(self, message, method):
self.steps.append((message, method))
def step(self, message, method, run_after_failure=False):
self.steps.append((message, method, run_after_failure))
def start_creation(self, start_message=None, end_message=None,
show_service_name=True, runtime=-1):
@ -375,15 +376,32 @@ class Service(object):
else:
self.print_msg(start_message)
step = 0
for (message, method) in self.steps:
self.print_msg(" [%d/%d]: %s" % (step+1, len(self.steps), message))
def run_step(message, method):
self.print_msg(message)
s = datetime.datetime.now()
method()
e = datetime.datetime.now()
d = e - s
root_logger.debug(" duration: %d seconds" % d.seconds)
step += 1
step = 0
steps_iter = iter(self.steps)
try:
for message, method, run_after_failure in steps_iter:
full_msg = " [%d/%d]: %s" % (step+1, len(self.steps), message)
run_step(full_msg, method)
step += 1
except BaseException as e:
# show the traceback, so it's not lost if the cleanup method fails
root_logger.debug("%s" % traceback.format_exc())
self.print_msg(' [error] %s: %s' % (type(e).__name__, e))
# run through remaining methods marked run_after_failure
for message, method, run_after_failure in steps_iter:
if run_after_failure:
run_step(" [cleanup]: %s" % message, method)
raise
self.print_msg(end_message)

19
ipaserver/install/upgradeinstance.py
View File

@ -82,8 +82,11 @@ class IPAUpgrade(service.Service):
if self.schema_files:
self.step("updating schema", self.__update_schema)
self.step("upgrading server", self.__upgrade)
self.step("stopping directory server", self.__stop_instance)
self.step("restoring configuration", self.__restore_config)
self.step("stopping directory server", self.__stop_instance,
run_after_failure=True)
self.step("restoring configuration", self.__restore_config,
run_after_failure=True)
self.step("starting directory server", self.start)
self.start_creation(start_message="Upgrading IPA:",
@ -103,10 +106,14 @@ class IPAUpgrade(service.Service):
port = self.restore_state('nsslapd-port')
security = self.restore_state('nsslapd-security')
installutils.set_directive(self.filename, 'nsslapd-port',
port, quotes=False, separator=':')
installutils.set_directive(self.filename, 'nsslapd-security',
security, quotes=False, separator=':')
if port is not None:
installutils.set_directive(
self.filename, 'nsslapd-port', port,
quotes=False, separator=':')
if security is not None:
installutils.set_directive(
self.filename, 'nsslapd-security', security,
quotes=False, separator=':')
def __disable_listeners(self):
installutils.set_directive(self.filename, 'nsslapd-port',