From e23492c138343428b8bdd6eb89dcde0aaa1df3b2 Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen Date: Thu, 26 Jan 2023 13:46:11 +0100 Subject: [PATCH] - fence_vmware_soap: set login_timeout lower than default pcmk_monitor_timeout (20s) to remove tmp dirs Resolves: rhbz#2122944 --- ...2944-2-fence_vmware_soap-login-timeout-15s.patch | 12 ++++++------ fence-agents.spec | 13 +++++++------ 2 files changed, 13 insertions(+), 12 deletions(-) rename bz2122944-2-fence_vmware_soap-login-timeout-50s.patch => bz2122944-2-fence_vmware_soap-login-timeout-15s.patch (69%) diff --git a/bz2122944-2-fence_vmware_soap-login-timeout-50s.patch b/bz2122944-2-fence_vmware_soap-login-timeout-15s.patch similarity index 69% rename from bz2122944-2-fence_vmware_soap-login-timeout-50s.patch rename to bz2122944-2-fence_vmware_soap-login-timeout-15s.patch index d9f7f7c..58b90bc 100644 --- a/bz2122944-2-fence_vmware_soap-login-timeout-50s.patch +++ b/bz2122944-2-fence_vmware_soap-login-timeout-15s.patch @@ -1,15 +1,15 @@ -From 8f71784c66e812f31fdc3e2523bd9abcc5d7cdcb Mon Sep 17 00:00:00 2001 +From 2d4b3ea47fa7a9a301d34cefc8f279cae7df4afd Mon Sep 17 00:00:00 2001 From: Oyvind Albrigtsen -Date: Fri, 11 Nov 2022 13:53:24 +0100 -Subject: [PATCH] fence_vmware_soap: set default login timeout less than - Pacemakers default timeout to remove tmp dirs +Date: Thu, 26 Jan 2023 13:19:16 +0100 +Subject: [PATCH] fence_vmware_soap: set login_timeout lower than default + pcmk_monitor_timeout (20s) to remove tmp dirs on fail --- agents/vmware_soap/fence_vmware_soap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/agents/vmware_soap/fence_vmware_soap.py b/agents/vmware_soap/fence_vmware_soap.py -index 51fb0f147..b1d27a9fb 100644 +index b1d27a9fb..4a4ec1780 100644 --- a/agents/vmware_soap/fence_vmware_soap.py +++ b/agents/vmware_soap/fence_vmware_soap.py @@ -57,7 +57,7 @@ def soap_login(options): @@ -17,7 +17,7 @@ index 51fb0f147..b1d27a9fb 100644 try: headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : "vim25"} - login_timeout = int(options["--login-timeout"]) or 60 -+ login_timeout = int(options["--login-timeout"]) or 50 ++ login_timeout = int(options["--login-timeout"]) or 15 conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers, timeout=login_timeout) mo_ServiceInstance = Property('ServiceInstance') diff --git a/fence-agents.spec b/fence-agents.spec index 8d2355e..1cbfbaa 100644 --- a/fence-agents.spec +++ b/fence-agents.spec @@ -60,7 +60,7 @@ Name: fence-agents Summary: Set of unified programs capable of host isolation ("fencing") Version: 4.10.0 -Release: 42%{?alphatag:.%{alphatag}}%{?dist} +Release: 43%{?alphatag:.%{alphatag}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/fence-agents Source0: https://fedorahosted.org/releases/f/e/fence-agents/%{name}-%{version}.tar.gz @@ -220,7 +220,7 @@ Patch25: bz2092385-fence_ibm_vpc-add-proxy-support.patch Patch26: bz2093216-fence_ibm_powervs-proxy-private-api-servers.patch Patch27: bz2041933-bz2041935-3-fencing-source_env-dont-process-empty-lines.patch Patch28: bz2122944-1-fence_vmware_soap-set-timeout-cleanup-tmp-dirs.patch -Patch29: bz2122944-2-fence_vmware_soap-login-timeout-50s.patch +Patch29: bz2122944-2-fence_vmware_soap-login-timeout-15s.patch Patch30: bz2111998-fence_ibm_vpc-add-token-cache-support.patch Patch31: bz2132008-fence_virt-add-note-reboot-action.patch Patch32: bz2134015-fence_lpar-only-output-additional-info-on-debug.patch @@ -1447,6 +1447,11 @@ are located on corosync cluster nodes. %endif %changelog +* Thu Jan 26 2023 Oyvind Albrigtsen - 4.10.0-43 +- fence_vmware_soap: set login_timeout lower than default + pcmk_monitor_timeout (20s) to remove tmp dirs + Resolves: rhbz#2122944 + * Tue Jan 24 2023 Oyvind Albrigtsen - 4.10.0-42 - fencing/fence_wti: add --plug-separator to be able to avoid characters that are in node name(s) @@ -1466,10 +1471,6 @@ are located on corosync cluster nodes. Resolves: rhbz#2144531 -* Fri Nov 11 2022 Oyvind Albrigtsen - 4.10.0-38 -- fence_vmware_soap: set timeout, which should help cleanup tmp dirs - Resolves: rhbz#2122944 - * Tue Nov 8 2022 Oyvind Albrigtsen - 4.10.0-37 - Upgrade bundled python-oauthlib Resolves: rhbz#2128564