pool/sanlock
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1178397 from Virtualization

Browse Source 
- Update to sanlock 3.9.3
  - Make the watchdog timeout configurable
  - wdmd: close watchdog when not used
  - userstorage: replace by PyPI userstorage
  - sanlock: skip short delay in delta lease reacquire
  - sanlock: use product_uuid for host name
  - wdmd: fix timing for iTCO_wdt
  - sanlock: save client_id in token and report in status and use in -C
  - sanlock: include startup message in syslog
  - sanlock: improve repeated ballots in paxos_acquire
  - sanlock: fix zero io timeout for direct requests
  - sanlock: fix release writing zero dblock values
  - sanlock: skip delay when same host acquires delta lease

OBS-URL: https://build.opensuse.org/request/show/1178397
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sanlock?expand=0&rev=32
This commit is contained in:
Ana Guerrero 2024-06-06 10:31:15 +00:00 committed by Git OBS Bridge
commit be4d8e0b8f
10 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_service
View File

@ -1,7 +1,7 @@
<services>
<service name="tar_scm" mode="disabled">
<param name="filename">sanlock</param>
<param name="revision">b820c63093c4ae85d7da4f719cf3026d7fca5d09</param>
<param name="revision">79b35bba8298f4444923c15e11bed38380cb18ee</param>
<param name="scm">git</param>
<param name="submodules">disable</param>
<param name="url">https://pagure.io/sanlock</param>

6
harden_fence_sanlockd.service.patch
View File

@ -1,7 +1,7 @@
Index: sanlock-3.8.5/init.d/fence_sanlockd.service
Index: sanlock-3.9.3/init.d/fence_sanlockd.service
===================================================================
--- sanlock-3.8.5.orig/init.d/fence_sanlockd.service
+++ sanlock-3.8.5/init.d/fence_sanlockd.service
--- sanlock-3.9.3.orig/init.d/fence_sanlockd.service
+++ sanlock-3.9.3/init.d/fence_sanlockd.service
@@ -4,6 +4,17 @@ After=syslog.target wdmd.service sanlock
Before=corosync.service

6
harden_sanlk-resetd.service.patch
View File

@ -1,7 +1,7 @@
Index: sanlock-3.8.5/init.d/sanlk-resetd.service
Index: sanlock-3.9.3/init.d/sanlk-resetd.service
===================================================================
--- sanlock-3.8.5.orig/init.d/sanlk-resetd.service
+++ sanlock-3.8.5/init.d/sanlk-resetd.service
--- sanlock-3.9.3.orig/init.d/sanlk-resetd.service
+++ sanlock-3.9.3/init.d/sanlk-resetd.service
@@ -4,6 +4,17 @@ After=wdmd.service sanlock.service
Requires=wdmd.service sanlock.service

3
sanlock-3.8.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6a8c2485d9246614d4fd7a87589d5ceaf6a65d1484b2077b5a83c2fce8dba079
size 202724

3
sanlock-3.9.3.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c08bdf5c62ae514281efc96063cf87dc96ca6247b580d5080d356060726e1c35
size 208896

2
sanlock-SCHED_RESET_ON_FORK-undefined.patch
View File

@ -17,7 +17,7 @@ Index: wdmd/main.c
===================================================================
--- wdmd/main.c.orig
+++ wdmd/main.c
@@ -41,6 +41,10 @@
@@ -43,6 +43,10 @@
#define GNUC_UNUSED __attribute__((__unused__))
#endif

17
sanlock.changes
View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Mon Jun 3 22:54:40 UTC 2024 - James Fehlig <jfehlig@suse.com>
- Update to sanlock 3.9.3
- Make the watchdog timeout configurable
- wdmd: close watchdog when not used
- userstorage: replace by PyPI userstorage
- sanlock: skip short delay in delta lease reacquire
- sanlock: use product_uuid for host name
- wdmd: fix timing for iTCO_wdt
- sanlock: save client_id in token and report in status and use in -C
- sanlock: include startup message in syslog
- sanlock: improve repeated ballots in paxos_acquire
- sanlock: fix zero io timeout for direct requests
- sanlock: fix release writing zero dblock values
- sanlock: skip delay when same host acquires delta lease
-------------------------------------------------------------------
Mon Feb 26 13:04:34 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>

2
sanlock.spec
View File

@ -40,7 +40,7 @@
%endif
%define pname sanlock
Name: %{pprefix}%{pname}
Version: 3.8.5
Version: 3.9.3
Release: 0
%if ! %{with python}
Summary: A shared disk lock manager

14
suse-no-date-time.patch
View File

@ -1,8 +1,8 @@
Index: sanlock-3.8.5/src/main.c
Index: sanlock-3.9.3/src/main.c
===================================================================
--- sanlock-3.8.5.orig/src/main.c
+++ sanlock-3.8.5/src/main.c
@@ -2209,8 +2209,8 @@ static int read_command_line(int argc, c
--- sanlock-3.9.3.orig/src/main.c
+++ sanlock-3.9.3/src/main.c
@@ -2334,8 +2334,8 @@ static int read_command_line(int argc, c
}
if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) {
@ -13,10 +13,10 @@ Index: sanlock-3.8.5/src/main.c
exit(EXIT_SUCCESS);
}
Index: sanlock-3.8.5/fence_sanlock/fence_sanlockd.c
Index: sanlock-3.9.3/fence_sanlock/fence_sanlockd.c
===================================================================
--- sanlock-3.8.5.orig/fence_sanlock/fence_sanlockd.c
+++ sanlock-3.8.5/fence_sanlock/fence_sanlockd.c
--- sanlock-3.9.3.orig/fence_sanlock/fence_sanlockd.c
+++ sanlock-3.9.3/fence_sanlock/fence_sanlockd.c
@@ -565,8 +565,7 @@ int main(int argc, char *argv[])
print_usage();
exit(0);

27
suse-systemd.patch
View File

@ -1,7 +1,7 @@
Index: sanlock-3.8.5/init.d/sanlock.service
Index: sanlock-3.9.3/init.d/sanlock.service
===================================================================
--- sanlock-3.8.5.orig/init.d/sanlock.service
+++ sanlock-3.8.5/init.d/sanlock.service
--- sanlock-3.9.3.orig/init.d/sanlock.service
+++ sanlock-3.9.3/init.d/sanlock.service
@@ -5,8 +5,10 @@ Wants=wdmd.service
[Service]
@ -15,16 +15,15 @@ Index: sanlock-3.8.5/init.d/sanlock.service
[Install]
WantedBy=multi-user.target
Index: sanlock-3.8.5/init.d/wdmd.service
Index: sanlock-3.9.3/init.d/wdmd.service
===================================================================
--- sanlock-3.8.5.orig/init.d/wdmd.service
+++ sanlock-3.8.5/init.d/wdmd.service
@@ -4,8 +4,10 @@ After=syslog.target
[Service]
--- sanlock-3.9.3.orig/init.d/wdmd.service
+++ sanlock-3.9.3/init.d/wdmd.service
@@ -6,7 +6,10 @@ After=syslog.target
Type=forking
-ExecStart=/lib/systemd/systemd-wdmd start
-ExecStop=/lib/systemd/systemd-wdmd stop
ExecStartPre=/lib/systemd/systemd-wdmd watchdog-check
ExecStart=/usr/sbin/wdmd
-SendSIGKILL=no
+EnvironmentFile=-/etc/sysconfig/wdmd
+ExecStart=/usr/sbin/wdmd $WDMDOPTS
+ExecStop=/bin/kill -TERM $MAINPID
@ -32,10 +31,10 @@ Index: sanlock-3.8.5/init.d/wdmd.service
[Install]
WantedBy=multi-user.target
Index: sanlock-3.8.5/init.d/fence_sanlockd.service
Index: sanlock-3.9.3/init.d/fence_sanlockd.service
===================================================================
--- sanlock-3.8.5.orig/init.d/fence_sanlockd.service
+++ sanlock-3.8.5/init.d/fence_sanlockd.service
--- sanlock-3.9.3.orig/init.d/fence_sanlockd.service
+++ sanlock-3.9.3/init.d/fence_sanlockd.service
@@ -5,8 +5,8 @@ Before=corosync.service
[Service]