diff --git a/0001-sanlock-fix-zero-io-timeout-for-direct-lockspace-req.patch b/0001-sanlock-fix-zero-io-timeout-for-direct-lockspace-req.patch new file mode 100644 index 0000000000000000000000000000000000000000..b0dd5d7045140792c3f0648a1e5682d8805fbd85 --- /dev/null +++ b/0001-sanlock-fix-zero-io-timeout-for-direct-lockspace-req.patch @@ -0,0 +1,25 @@ +From 77ad5324fbad7558dd555cd7cabb0fa22a49e38a Mon Sep 17 00:00:00 2001 +From: David Teigland +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, §or_size, &align_size, &max_hosts, "LSF"); + if (rv) +-- +2.48.1 + diff --git a/sanlock-4.0.0.tar.gz b/sanlock-4.0.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..625c8e436fc3ad0728abe9b6f5a4aa1e08a6fd75 Binary files /dev/null and b/sanlock-4.0.0.tar.gz differ diff --git a/sanlock.spec b/sanlock.spec index e8608c89c9f64bf8051913990900f4826bfed517..4046e667c390e7abff90f9e5f18206527e269211 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,12 +1,13 @@ -%define anolis_release 1 +%define anolis_release 1 Name: sanlock -Version: 3.9.5 +Version: 4.0.0 Release: %{anolis_release}%{?dist} Summary: A shared storage lock manager License: GPLv2 and GPLv2+ and LGPLv2+ URL: https://pagure.io/sanlock/ +Source0: https://releases.pagure.org/sanlock/sanlock-4.0.0.tar.gz BuildRequires: gcc BuildRequires: libaio-devel BuildRequires: libblkid-devel @@ -23,10 +24,10 @@ Requires(post): systemd-units Requires(post): systemd-sysv Requires(preun): systemd-units Requires(postun): systemd-units -Source0: https://releases.pagure.org/sanlock/%{name}-%{version}.tar.gz Patch0001: 0001-systemd-wdmd-work-around-race-with-udev-setting-soft.patch Patch0002: 0002-sanlock-new-NODELAY-flag-for-add_lockspace.patch +Patch3: 0001-sanlock-fix-zero-io-timeout-for-direct-lockspace-req.patch %description The sanlock daemon manages leases for applications on hosts using shared storage. @@ -181,6 +182,10 @@ Doc files for %{name} %doc README.rst %changelog +* Tue Oct 28 2025 wenyuzifang - 4.0.0-1 +- Updated to version 4.0.0 to fix xxxxxx +- Prevent infinite I/O waits by ensuring a default timeout is always applied. + * Tue Mar 4 2025 Chang Gao - 3.9.5-1 - Update to 3.9.5 - Add patch to work around race with udev setting softdog label