saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-15 17:20:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Ensure file clients for runner, wheel, local and caller are available from the client_cache if called upon

Browse source
This commit is contained in:
David Murphy 2025-02-21 15:14:54 -07:00 • committed by Daniel Wozniak
parent 16064410f9
commit 7fb8eb538b
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog/61416.fixed.md Normal file
View file

@ -0,0 +1 @@
Ensure file clients for runner, wheel, local and caller are available from the client_cache if called upon.

20
salt/utils/reactor.py
View file

@ -464,22 +464,42 @@ class ReactWrap:
""" """
Wrap RunnerClient for executing :ref:`runner modules <all-salt.runners>` Wrap RunnerClient for executing :ref:`runner modules <all-salt.runners>`
""" """
# pylint: disable=unsupported-membership-test,unsupported-assignment-operation
if "runner" not in self.client_cache:
log.debug("reactor edge case: re-populating client_cache for runner")
low = {"state": "runner"}
self.populate_client_cache(low)
return self.pool.fire_async(self.client_cache["runner"].low, args=(fun, kwargs)) return self.pool.fire_async(self.client_cache["runner"].low, args=(fun, kwargs))
def wheel(self, fun, **kwargs): def wheel(self, fun, **kwargs):
""" """
Wrap Wheel to enable executing :ref:`wheel modules <all-salt.wheel>` Wrap Wheel to enable executing :ref:`wheel modules <all-salt.wheel>`
""" """
# pylint: disable=unsupported-membership-test,unsupported-assignment-operation
if "wheel" not in self.client_cache:
log.debug("reactor edge case: re-populating client_cache for wheel")
low = {"state": "wheel"}
self.populate_client_cache(low)
return self.pool.fire_async(self.client_cache["wheel"].low, args=(fun, kwargs)) return self.pool.fire_async(self.client_cache["wheel"].low, args=(fun, kwargs))
def local(self, fun, tgt, **kwargs): def local(self, fun, tgt, **kwargs):
""" """
Wrap LocalClient for running :ref:`execution modules <all-salt.modules>` Wrap LocalClient for running :ref:`execution modules <all-salt.modules>`
""" """
# pylint: disable=unsupported-membership-test,unsupported-assignment-operation
if "local" not in self.client_cache:
log.debug("reactor edge case: re-populating client_cache for local")
low = {"state": "local"}
self.populate_client_cache(low)
self.client_cache["local"].cmd_async(tgt, fun, **kwargs) self.client_cache["local"].cmd_async(tgt, fun, **kwargs)
def caller(self, fun, **kwargs): def caller(self, fun, **kwargs):
""" """
Wrap LocalCaller to execute remote exec functions locally on the Minion Wrap LocalCaller to execute remote exec functions locally on the Minion
""" """
# pylint: disable=unsupported-membership-test,unsupported-assignment-operation
if "caller" not in self.client_cache:
log.debug("reactor edge case: re-populating client_cache for caller")
low = {"state": "caller"}
self.populate_client_cache(low)
self.client_cache["caller"].cmd(fun, *kwargs["arg"], **kwargs["kwarg"]) self.client_cache["caller"].cmd(fun, *kwargs["arg"], **kwargs["kwarg"])