saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-16 09:40:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Ensure a sensible timeout for pgsql commands

Browse source 
The psql command has no default timeout, so if the server is not
responding or if some lock cannot be obtained, we will be waiting
forever.

Introduce a default timeout of 60s for all psql commands.
This commit is contained in:
André Cruz 2022-01-09 10:19:41 +00:00 • committed by Megan Wilhite
parent 2befb463b8
commit 29d88513b9
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/modules/postgres.py
View file

@ -68,6 +68,7 @@ log = logging.getLogger(__name__)
_DEFAULT_PASSWORDS_ENCRYPTION = "md5"
_DEFAULT_COMMAND_TIMEOUT_SECS = 60
_EXTENSION_NOT_INSTALLED = "EXTENSION NOT INSTALLED"
_EXTENSION_INSTALLED = "EXTENSION INSTALLED"
_EXTENSION_TO_UPGRADE = "EXTENSION TO UPGRADE"
@ -154,6 +155,7 @@ def _run_psql(cmd, runas=None, password=None, host=None, port=None, user=None):
kwargs = {
"reset_system_locale": False,
"clean_env": True,
"timeout": _DEFAULT_COMMAND_TIMEOUT_SECS,
}
if runas is None:
if not host:
@ -254,7 +256,7 @@ def _run_initdb(
__salt__["file.chown"](pgpassfile, runas, "")
cmd.extend(["--pwfile={}".format(pgpassfile)])
kwargs = dict(runas=runas, clean_env=True)
kwargs = dict(runas=runas, clean_env=True, timeout=_DEFAULT_COMMAND_TIMEOUT_SECS)
cmdstr = " ".join([pipes.quote(c) for c in cmd])
ret = __salt__["cmd.run_all"](cmdstr, python_shell=False, **kwargs)