mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-08-22 22:11:44 -07:00
correctly handle term signals
- adhoc now terminates gracefully - avoid race condition on terminations by ignoring errors if worker might have been reaped between checking if active and termination call - ansible-playbook now properly exits on sigint/term - adhoc and playbook now give exceptions that we should not normally capture and rely on top level finally to reap children - handle systemexit breaks in workers - added debug to see at which frame we exit partial fix for #14346
This commit is contained in:
parent
45755bc0e5
commit
5a1887cc76
5 changed files with 21 additions and 8 deletions
|
@ -21,6 +21,7 @@ __metaclass__ = type
|
|||
########################################################
|
||||
|
||||
import os
|
||||
import signal
|
||||
|
||||
from ansible import constants as C
|
||||
from ansible.cli import CLI
|
||||
|
@ -88,6 +89,10 @@ class AdHocCLI(CLI):
|
|||
tasks = [ dict(action=dict(module=self.options.module_name, args=parse_kv(self.options.module_args)), async=async, poll=poll) ]
|
||||
)
|
||||
|
||||
def _terminate(self, signum=None, framenum=None):
|
||||
if signum is not None:
|
||||
raise SystemExit("Interrupt detected, shutting down gracefully")
|
||||
|
||||
def run(self):
|
||||
''' use Runner lib to do SSH things '''
|
||||
|
||||
|
@ -170,6 +175,9 @@ class AdHocCLI(CLI):
|
|||
# now create a task queue manager to execute the play
|
||||
self._tqm = None
|
||||
try:
|
||||
# Manage user interruptions
|
||||
signal.signal(signal.SIGTERM, self._terminate)
|
||||
|
||||
self._tqm = TaskQueueManager(
|
||||
inventory=inventory,
|
||||
variable_manager=variable_manager,
|
||||
|
@ -180,6 +188,7 @@ class AdHocCLI(CLI):
|
|||
run_additional_callbacks=C.DEFAULT_LOAD_CALLBACK_PLUGINS,
|
||||
run_tree=run_tree,
|
||||
)
|
||||
|
||||
result = self._tqm.run(play)
|
||||
finally:
|
||||
if self._tqm:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue