rpms/fence-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Auto sync2gitlab import of fence-agents-4.2.1-112.el8.src.rpm

Browse Source
This commit is contained in:
CentOS Sources 2023-01-28 06:12:32 +00:00
parent 70ebc5b08c
commit 9d0751e3b5
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bz1787178-2-fence_vmware_soap-login-timeout-50s.patch → bz1787178-2-fence_vmware_soap-login-timeout-15s.patch
View File

@ -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 <oalbrigt@redhat.com>
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')

13
fence-agents.spec
View File

@ -87,7 +87,7 @@
Name: fence-agents
Summary: Set of unified programs capable of host isolation ("fencing")
Version: 4.2.1
Release: 111%{?alphatag:.%{alphatag}}%{?dist}
Release: 112%{?alphatag:.%{alphatag}}%{?dist}
License: GPLv2+ and LGPLv2+
Group: System Environment/Base
URL: https://github.com/ClusterLabs/fence-agents
@ -260,7 +260,7 @@ Patch117: bz2091826-fence_ibm_vpc-add-proxy-support.patch
Patch118: bz2092921-fence_ibm_powervs-proxy-private-api-servers.patch
Patch119: bz1886074-4-fencing-source_env-dont-process-empty-lines.patch
Patch120: bz1787178-1-fence_vmware_soap-set-timeout-cleanup-tmp-dirs.patch
Patch121: bz1787178-2-fence_vmware_soap-login-timeout-50s.patch
Patch121: bz1787178-2-fence_vmware_soap-login-timeout-15s.patch
Patch122: bz2102024-fence_ibm_vpc-add-token-cache-support.patch
Patch123: bz2134017-fence_lpar-only-output-additional-info-on-debug.patch
Patch124: bz2136076-fence_ibm_powervs-improve-defaults.patch
@ -1469,6 +1469,11 @@ Fence agent for IBM z/VM over IP.
%endif
%changelog
* Thu Jan 26 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-112
- fence_vmware_soap: set login_timeout lower than default
pcmk_monitor_timeout (20s) to remove tmp dirs
Resolves: rhbz#1787178
* Wed Jan 25 2023 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-111
- fencing/fence_wti: add --plug-separator to be able to avoid
characters that are in node name(s)
@ -1478,10 +1483,6 @@ Fence agent for IBM z/VM over IP.
- fence_scsi: skip key generation during validate-all action
Resolves: rhbz#2160478
* Fri Nov 11 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-109
- fence_vmware_soap: set timeout, which should help cleanup tmp dirs
Resolves: rhbz#1787178
* Thu Oct 27 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 4.2.1-108
- fence_ibm_powervs: improve defaults
Resolves: rhbz#2136076