From 728dc4e0530c53fbba3ae0817c44104f7381fe95d8e1e421924e4654caa0235b Mon Sep 17 00:00:00 2001 From: James Fehlig Date: Wed, 9 Jun 2021 22:24:29 +0000 Subject: [PATCH] Accepting request 898904 from home:jfehlig:branches:Virtualization - Update to sanlock 3.8.4 - sanlock: socket send and recv retries - python: expose {get,set}_lvb - sanlock: Shrink thread pool when there is no work - config: Add max_worker_threads OBS-URL: https://build.opensuse.org/request/show/898904 OBS-URL: https://build.opensuse.org/package/show/Virtualization/sanlock?expand=0&rev=65 --- _service | 2 +- sanlock-3.8.2.tar.xz | 3 --- sanlock-3.8.4.tar.xz | 3 +++ sanlock.changes | 9 +++++++++ sanlock.spec | 8 +++++--- suse-no-date-time.patch | 14 +++++++------- suse-systemd.patch | 18 +++++++++--------- 7 files changed, 34 insertions(+), 23 deletions(-) delete mode 100644 sanlock-3.8.2.tar.xz create mode 100644 sanlock-3.8.4.tar.xz diff --git a/_service b/_service index 0b79bda..eb2a124 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ sanlock - 01b727adf1ce3c0ed5b95299d60f62bc66d98eb5 + a181e951376d49a82eef17920c8ebedec80b4823 git disable https://pagure.io/sanlock diff --git a/sanlock-3.8.2.tar.xz b/sanlock-3.8.2.tar.xz deleted file mode 100644 index 9bb29e4..0000000 --- a/sanlock-3.8.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0a2235309b513bcec38fb773a0d96cbed55d5fcd7ba95862efdd043059f2439 -size 199544 diff --git a/sanlock-3.8.4.tar.xz b/sanlock-3.8.4.tar.xz new file mode 100644 index 0000000..1f0a57e --- /dev/null +++ b/sanlock-3.8.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34cd7a27b59006904e40ee1146e0c6fb4006284f6bdb1a21ae69e612bd19fc90 +size 201988 diff --git a/sanlock.changes b/sanlock.changes index b79d2e5..8f87b4e 100644 --- a/sanlock.changes +++ b/sanlock.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Wed Jun 9 19:58:35 UTC 2021 - James Fehlig + +- Update to sanlock 3.8.4 + - sanlock: socket send and recv retries + - python: expose {get,set}_lvb + - sanlock: Shrink thread pool when there is no work + - config: Add max_worker_threads + ------------------------------------------------------------------- Fri Oct 23 20:58:29 UTC 2020 - Benjamin Greiner diff --git a/sanlock.spec b/sanlock.spec index 6a0d79e..d1973c6 100644 --- a/sanlock.spec +++ b/sanlock.spec @@ -1,7 +1,7 @@ # -# spec file for package sanlock +# spec file # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -40,7 +40,7 @@ %endif %define pname sanlock Name: %{pprefix}%{pname} -Version: 3.8.2 +Version: 3.8.4 Release: 0 %if ! %{with python} Summary: A shared disk lock manager @@ -245,6 +245,7 @@ getent passwd sanlock > /dev/null || useradd \ %service_del_postun wdmd.service sanlock.service %postun -n libsanlock1 -p /sbin/ldconfig + %postun -n fence-sanlock %service_del_postun fence_sanlockd.service @@ -307,6 +308,7 @@ getent passwd sanlock > /dev/null || useradd \ %endif %else + %files %{python_files} %{python_sitearch}/sanlock*.so %{python_sitearch}/sanlock_python-%{version}*info diff --git a/suse-no-date-time.patch b/suse-no-date-time.patch index 954b9e4..6dda1a7 100644 --- a/suse-no-date-time.patch +++ b/suse-no-date-time.patch @@ -1,8 +1,8 @@ -Index: sanlock-3.8.2/src/main.c +Index: sanlock-3.8.4/src/main.c =================================================================== ---- sanlock-3.8.2.orig/src/main.c -+++ sanlock-3.8.2/src/main.c -@@ -2183,8 +2183,8 @@ static int read_command_line(int argc, c +--- sanlock-3.8.4.orig/src/main.c ++++ sanlock-3.8.4/src/main.c +@@ -2208,8 +2208,8 @@ static int read_command_line(int argc, c } if (!strcmp(arg1, "--version") || !strcmp(arg1, "-V")) { @@ -13,10 +13,10 @@ Index: sanlock-3.8.2/src/main.c exit(EXIT_SUCCESS); } -Index: sanlock-3.8.2/fence_sanlock/fence_sanlockd.c +Index: sanlock-3.8.4/fence_sanlock/fence_sanlockd.c =================================================================== ---- sanlock-3.8.2.orig/fence_sanlock/fence_sanlockd.c -+++ sanlock-3.8.2/fence_sanlock/fence_sanlockd.c +--- sanlock-3.8.4.orig/fence_sanlock/fence_sanlockd.c ++++ sanlock-3.8.4/fence_sanlock/fence_sanlockd.c @@ -565,8 +565,7 @@ int main(int argc, char *argv[]) print_usage(); exit(0); diff --git a/suse-systemd.patch b/suse-systemd.patch index 075fb86..09ba7c7 100644 --- a/suse-systemd.patch +++ b/suse-systemd.patch @@ -1,7 +1,7 @@ -Index: sanlock-3.8.2/init.d/sanlock.service +Index: sanlock-3.8.4/init.d/sanlock.service =================================================================== ---- sanlock-3.8.2.orig/init.d/sanlock.service -+++ sanlock-3.8.2/init.d/sanlock.service +--- sanlock-3.8.4.orig/init.d/sanlock.service ++++ sanlock-3.8.4/init.d/sanlock.service @@ -5,8 +5,10 @@ Wants=wdmd.service [Service] @@ -15,10 +15,10 @@ Index: sanlock-3.8.2/init.d/sanlock.service [Install] WantedBy=multi-user.target -Index: sanlock-3.8.2/init.d/wdmd.service +Index: sanlock-3.8.4/init.d/wdmd.service =================================================================== ---- sanlock-3.8.2.orig/init.d/wdmd.service -+++ sanlock-3.8.2/init.d/wdmd.service +--- sanlock-3.8.4.orig/init.d/wdmd.service ++++ sanlock-3.8.4/init.d/wdmd.service @@ -4,8 +4,10 @@ After=syslog.target [Service] @@ -32,10 +32,10 @@ Index: sanlock-3.8.2/init.d/wdmd.service [Install] WantedBy=multi-user.target -Index: sanlock-3.8.2/init.d/fence_sanlockd.service +Index: sanlock-3.8.4/init.d/fence_sanlockd.service =================================================================== ---- sanlock-3.8.2.orig/init.d/fence_sanlockd.service -+++ sanlock-3.8.2/init.d/fence_sanlockd.service +--- sanlock-3.8.4.orig/init.d/fence_sanlockd.service ++++ sanlock-3.8.4/init.d/fence_sanlockd.service @@ -5,8 +5,8 @@ Before=corosync.service [Service]