diff options
| author | Ana Krivokapic <akrivoka@redhat.com> | 2013-07-11 14:23:05 +0200 |
|---|---|---|
| committer | Martin Kosek <mkosek@redhat.com> | 2013-07-16 12:15:37 +0200 |
| commit | 90ccaf615688629dba9d86c380da87761092b255 (patch) | |
| tree | cf436adcdb8e68ee953977b9d86a304900768b2b | |
| parent | 3ad2e5ae0a5947b5dd8175b538f53068f84b0bd8 (diff) | |
| download | freeipa.git-90ccaf615688629dba9d86c380da87761092b255.tar.gz freeipa.git-90ccaf615688629dba9d86c380da87761092b255.tar.xz freeipa.git-90ccaf615688629dba9d86c380da87761092b255.zip | |
Use --ignore-dependencies only when necessary
Using the --ignore-dependencies switch was causing the ipactl stop command
not to stop all instances of dirsrv and dogtag. Make sure the switch is used
only when necessary, i.e. to prevent ipa-otpd.socket from getting stuck during
the shutdown transaction.
https://fedorahosted.org/freeipa/ticket/3730
https://fedorahosted.org/freeipa/ticket/3729
| -rw-r--r-- | ipapython/platform/base/systemd.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ipapython/platform/base/systemd.py b/ipapython/platform/base/systemd.py index 84287e38..f1220186 100644 --- a/ipapython/platform/base/systemd.py +++ b/ipapython/platform/base/systemd.py @@ -98,15 +98,16 @@ class SystemdService(base.PlatformService): def stop(self, instance_name="", capture_output=True): instance = self.service_instance(instance_name) + args = ["/bin/systemctl", "stop", instance] # 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 instance == "ipa-otpd.socket": + args.append("--ignore-dependencies") + + ipautil.run(args, capture_output=capture_output) if 'context' in api.env and api.env.context in ['ipactl', 'installer']: update_service_list = True |