IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-23 07:33:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Avoid systemd service deadlock during shutdown

Browse Source 
https://fedorahosted.org/freeipa/ticket/3729
This commit is contained in:
Ana Krivokapic 2013-06-20 17:04:49 +02:00 committed by Alexander Bokovoy
parent 3b93df4e4e
commit fb166e8f5c
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ipapython/platform/base/systemd.py
View File

@ -97,7 +97,17 @@ class SystemdService(base.PlatformService):
ipautil.wait_for_open_ports('localhost', ports, api.env.startup_timeout)
def stop(self, instance_name="", capture_output=True):
ipautil.run(["/bin/systemctl", "stop", self.service_instance(instance_name)], capture_output=capture_output)
instance = self.service_instance(instance_name)
# The --ignore-dependencies switch is used to avoid possible
# deadlock during the shutdown transaction. For more details, see
# https://fedorahosted.org/freeipa/ticket/3729#comment:1 and
# https://bugzilla.redhat.com/show_bug.cgi?id=973331#c11
ipautil.run(
["/bin/systemctl", "stop", instance, "--ignore-dependencies"],
capture_output=capture_output
)
if 'context' in api.env and api.env.context in ['ipactl', 'installer']:
update_service_list = True
else: