OSSForks/ansible
1
0
Fork 0
mirror of https://github.com/zebrajr/ansible.git synced 2025-12-06 12:19:53 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix psrp - ReadTimeout exceptions now mark host as unreachable (#85974)

Browse Source 
* psrp - ReadTimeout exceptions now mark host as unreachable

* add try to _exec_psrp_script

* fix indent E111

* update raise format

switch to raise Exception from e

Co-authored-by: Jordan Borean <jborean93@gmail.com>

---------

Co-authored-by: Jordan Borean <jborean93@gmail.com>
This commit is contained in:
Michał Gąsior 2025-10-14 21:59:00 +02:00 committed by GitHub
parent c02f59ca3a
commit 9fcf1f7c58
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelogs/fragments/85966-psrp-readtimeout.yml Normal file
View File

@ -0,0 +1,2 @@
bugfixes:
- psrp - ReadTimeout exceptions now mark host as unreachable instead of fatal (https://github.com/ansible/ansible/issues/85966)

17
lib/ansible/plugins/connection/psrp.py
View File

@ -331,7 +331,7 @@ try:
from pypsrp.host import PSHost, PSHostUserInterface from pypsrp.host import PSHost, PSHostUserInterface
from pypsrp.powershell import PowerShell, RunspacePool from pypsrp.powershell import PowerShell, RunspacePool
from pypsrp.wsman import WSMan from pypsrp.wsman import WSMan
from requests.exceptions import ConnectionError, ConnectTimeout from requests.exceptions import ConnectionError, ConnectTimeout, ReadTimeout
except ImportError as err: except ImportError as err:
HAS_PYPSRP = False HAS_PYPSRP = False
PYPSRP_IMP_ERR = err PYPSRP_IMP_ERR = err
@ -479,11 +479,16 @@ class Connection(ConnectionBase):
pwsh_in_data = in_data pwsh_in_data = in_data
display.vvv(u"PSRP: EXEC %s" % script, host=self._psrp_host) display.vvv(u"PSRP: EXEC %s" % script, host=self._psrp_host)
rc, stdout, stderr = self._exec_psrp_script( try:
script=script, rc, stdout, stderr = self._exec_psrp_script(
input_data=pwsh_in_data.splitlines() if pwsh_in_data else None, script=script,
arguments=script_args, input_data=pwsh_in_data.splitlines() if pwsh_in_data else None,
) arguments=script_args,
)
except ReadTimeout as e:
raise AnsibleConnectionFailure(
"HTTP read timeout during PSRP script execution"
) from e
return rc, stdout, stderr return rc, stdout, stderr
def put_file(self, in_path: str, out_path: str) -> None: def put_file(self, in_path: str, out_path: str) -> None: