Resolves: RHEL-76178

This commit is contained in:
David Teigland 2025-05-01 10:44:00 -05:00
parent b4326c097f
commit 345c7bb1d9
4 changed files with 33 additions and 6 deletions

1
.gitignore vendored
View File

@ -33,3 +33,4 @@
/sanlock-3.9.1.tar.gz
/sanlock-3.9.3.tar.gz
/sanlock-3.9.5.tar.gz
/sanlock-4.0.0.tar.gz

View File

@ -0,0 +1,25 @@
From 77ad5324fbad7558dd555cd7cabb0fa22a49e38a Mon Sep 17 00:00:00 2001
From: David Teigland <teigland@redhat.com>
Date: Wed, 30 Apr 2025 11:06:51 -0500
Subject: [PATCH] sanlock: fix zero io timeout for direct lockspace requests
---
src/direct.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/direct.c b/src/direct.c
index 208dd3509b14..e009de1a44b5 100644
--- a/src/direct.c
+++ b/src/direct.c
@@ -314,6 +314,8 @@ static int do_delta_action(int action,
if (!io_timeout)
io_timeout = com.io_timeout;
+ if (!io_timeout)
+ io_timeout = DEFAULT_IO_TIMEOUT;
rv = sizes_from_flags(ls->flags, &sector_size, &align_size, &max_hosts, "LSF");
if (rv)
--
2.48.1

View File

@ -1,6 +1,6 @@
Name: sanlock
Version: 3.9.5
Release: 3%{?dist}
Version: 4.0.0
Release: 1%{?dist}
Summary: A shared storage lock manager
License: GPLv2 and GPLv2+ and LGPLv2+
@ -22,8 +22,7 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz
Patch0: 0001-systemd-wdmd-work-around-race-with-udev-setting-soft.patch
Patch1: 0002-sanlock-new-NODELAY-flag-for-add_lockspace.patch
Patch0: 0001-sanlock-fix-zero-io-timeout-for-direct-lockspace-req.patch
%description
The sanlock daemon manages leases for applications on hosts using shared storage.
@ -31,7 +30,6 @@ The sanlock daemon manages leases for applications on hosts using shared storage
%prep
%setup -q
%patch0 -p1 -b .backup0
%patch1 -p1 -b .backup1
%build
%set_build_flags
@ -155,6 +153,9 @@ developing applications that use %{name}.
%{_libdir}/pkgconfig/libsanlock_client.pc
%changelog
* Thu May 01 2025 David Teigland <teigland@redhat.com> - 4.0.0-1
- new upstream release
* Wed Oct 23 2024 David Teigland <teigland@redhat.com> - 3.9.5-3
- new nodelay flag for add_lockspace

View File

@ -1 +1 @@
SHA512 (sanlock-3.9.5.tar.gz) = 2342ee57d98c0e209d92ad809aae22f919c02920a2db194be2fc4f60677c32c2f27621ab0183b69c36ae1d0814753fb3461985bc4a8d1bced879b403ff0cf400
SHA512 (sanlock-4.0.0.tar.gz) = a478c8bbc09043d5dad18cc3ddbcaeefec0dd5587ab2807721424a1efc9d58ab82deacaa2f88289dc9990a2a6f95a80dabb727670e7aeaeba5ed0a57a3849c27