ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-04 17:32:58 +00:00
Code Activity

supervisorctl: use parallel bulk commands when name=all (#11953)

Browse source 
* feat(supervisorctl): use parallel bulk commands for name=all

When name=all, dispatch a single `supervisorctl start/stop/restart all`
instead of iterating per process, matching the CLI's parallel behaviour.
Also extract inline status-filter lambdas into named module-level functions.

Fixes #8159

* feat(changelog): add fragment for PR 11953
This commit is contained in:
Alexei Znamensky 2026-05-02 10:35:57 +12:00 • committed by GitHub
parent 89e0d07071
commit a6dd7ce58c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 43 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

46
plugins/modules/supervisorctl.py
View file

@ -117,6 +117,22 @@ import os
from ansible.module_utils.basic import AnsibleModule, is_executable
def _is_active(status):
return status in ("RUNNING", "STARTING")
def _is_not_active(status):
return not _is_active(status)
def _is_strictly_running(status):
return status in ("RUNNING",)
def _always(_status):
return True
def main():
arg_spec = dict(
name=dict(type="str", required=True),
@ -231,13 +247,31 @@ def main():
if exit_module:
module.exit_json(changed=True, name=name, state=state, affected=to_take_action_on)
if name == "all" and state in ("started", "stopped", "restarted"):
if state == "restarted":
run_supervisorctl("update", check_rc=True)
processes = get_matched_processes()
status_filters = {
"started": _is_not_active,
"stopped": _is_active,
"restarted": _always,
}
to_act_on = [p for p, s in processes if status_filters[state](s)]
if not to_act_on:
module.exit_json(changed=False, name=name, state=state)
if module.check_mode:
module.exit_json(changed=True)
actions = {"started": "start", "stopped": "stop", "restarted": "restart"}
run_supervisorctl(actions[state], "all", check_rc=True)
module.exit_json(changed=True, name=name, state=state, affected=to_act_on)
if state == "restarted":
rc, out, err = run_supervisorctl("update", check_rc=True)
processes = get_matched_processes()
if len(processes) == 0:
module.fail_json(name=name, msg="ERROR (no such process)")
take_action_on_processes(processes, lambda s: True, "restart", "started")
take_action_on_processes(processes, _always, "restart", "started")
processes = get_matched_processes()
@ -246,9 +280,7 @@ def main():
module.exit_json(changed=False, name=name, state=state)
if stop_before_removing:
take_action_on_processes(
processes, lambda s: s in ("RUNNING", "STARTING"), "stop", "stopped", exit_module=False
)
take_action_on_processes(processes, _is_active, "stop", "stopped", exit_module=False)
if module.check_mode:
module.exit_json(changed=True)
@ -277,13 +309,13 @@ def main():
module.fail_json(name=name, msg="ERROR (no such process)")
if state == "started":
take_action_on_processes(processes, lambda s: s not in ("RUNNING", "STARTING"), "start", "started")
take_action_on_processes(processes, _is_not_active, "start", "started")
if state == "stopped":
take_action_on_processes(processes, lambda s: s in ("RUNNING", "STARTING"), "stop", "stopped")
take_action_on_processes(processes, _is_active, "stop", "stopped")
if state == "signalled":
take_action_on_processes(processes, lambda s: s in ("RUNNING",), f"signal {signal}", "signalled")
take_action_on_processes(processes, _is_strictly_running, f"signal {signal}", "signalled")
if __name__ == "__main__":