rpms/sanlock
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Import from AlmaLinux stable repository

Browse Source
This commit is contained in:
eabdullin 2025-12-04 13:34:42 +00:00
parent c8f102c57a
commit 73bca138b2
4 changed files with 56 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/sanlock-3.9.1.tar.gz
SOURCES/sanlock-4.0.0.tar.gz

2
.sanlock.metadata
View File

@ -1 +1 @@
ca8428d1be60cf92953b4aad4bf26802b9e7d266 SOURCES/sanlock-3.9.1.tar.gz
dfbea22e4e07ac3507be5585c101c1a281cf7271 SOURCES/sanlock-4.0.0.tar.gz

25
SOURCES/0001-sanlock-fix-zero-io-timeout-for-direct-lockspace-req.patch Normal file
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

37
SPECS/sanlock.spec
View File

@ -1,6 +1,6 @@
Name: sanlock
Version: 3.9.1
Release: 1%{?dist}
Version: 4.0.0
Release: 2%{?dist}
Summary: A shared storage lock manager
License: GPLv2 and GPLv2+ and LGPLv2+
@ -22,14 +22,14 @@ Requires(preun): systemd-units
Requires(postun): systemd-units
Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz
#Patch0:
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.
%prep
%setup -q
#%patch0 -p1 -b .backup0
%patch0 -p1 -b .backup0
%build
%set_build_flags
@ -53,9 +53,9 @@ make -C python \
PY_VERSION=3
install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT/%{_unitdir}/sanlock.service
install -D -m 0755 init.d/systemd-wdmd $RPM_BUILD_ROOT/usr/lib/systemd/systemd-wdmd
install -D -m 0644 init.d/wdmd.service $RPM_BUILD_ROOT/%{_unitdir}/wdmd.service
install -D -m 0644 init.d/sanlock.service.native $RPM_BUILD_ROOT%{_unitdir}/sanlock.service
install -D -m 0755 init.d/systemd-wdmd $RPM_BUILD_ROOT%{_prefix}/lib/systemd/systemd-wdmd
install -D -m 0644 init.d/wdmd.service $RPM_BUILD_ROOT%{_unitdir}/wdmd.service
install -D -m 0644 src/logrotate.sanlock \
$RPM_BUILD_ROOT/etc/logrotate.d/sanlock
@ -87,7 +87,7 @@ getent passwd sanlock > /dev/null || /usr/sbin/useradd \
%systemd_postun wdmd.service sanlock.service
%files
/usr/lib/systemd/systemd-wdmd
%{_prefix}/lib/systemd/systemd-wdmd
%{_unitdir}/sanlock.service
%{_unitdir}/wdmd.service
%{_sbindir}/sanlock
@ -153,6 +153,27 @@ developing applications that use %{name}.
%{_libdir}/pkgconfig/libsanlock_client.pc
%changelog
* Wed Aug 06 2025 Marian Csontos <mcsontos@redhat.com> - 4.0.0-2
- Bump release.
* 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
* Mon Oct 21 2024 David Teigland <teigland@redhat.com> - 3.9.5-2
- spec file fixes
* Fri Oct 18 2024 David Teigland <teigland@redhat.com> - 3.9.5-1
- upstream release 3.9.5, and udevadm settle patch
* Wed Aug 14 2024 David Teigland <teigland@redhat.com> - 3.9.3-2
- fix invalid strcpy in direct dump
* Wed May 15 2024 David Teigland <teigland@redhat.com> - 3.9.3-1
- upstream release
* Mon Jan 22 2024 David Teigland <teigland@redhat.com> - 3.9.1-1
- upstream release, fix rpm issues