Hello community, here is the log from the commit of package sbd for openSUSE:Factory checked in at 2020-08-29 20:42:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sbd (Old) and /work/SRC/openSUSE:Factory/.sbd.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd" Sat Aug 29 20:42:07 2020 rev:35 rq:830058 version:1.4.1+20200819.4a02ef2 Changes: -------- --- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2020-01-27 20:18:24.984558380 +0100 +++ /work/SRC/openSUSE:Factory/.sbd.new.3399/sbd.changes 2020-08-29 20:42:29.169468567 +0200 @@ -1,0 +2,47 @@ +Thu Aug 27 16:11:49 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20200819.4a02ef2: +- sbd-pacemaker: stay with basic string handling +- build: use configure for watchdog-default-timeout & others + +------------------------------------------------------------------- +Thu Aug 27 15:56:10 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20200807.7c21899: +- sbd-inquisitor: refuse to start if any of the configured device names is invalid (bsc#1174915) + +------------------------------------------------------------------- +Thu Aug 27 15:52:34 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20200727.1117c6b: +- make syncing of pacemaker resource startup configurable +- sbd-pacemaker: sync with pacemakerd for robustness + +------------------------------------------------------------------- +Thu Aug 27 15:50:38 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20200727.971affb: +- sbd-cluster: match qdevice-sync_timeout against wd-timeout + +- Rebase: + * bsc#1140065-Fix-sbd-cluster-exit-if-cmap-is-disconnected.patch + +------------------------------------------------------------------- +Thu Aug 27 15:49:06 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20200624.cee826a: +- sbd-pacemaker: handle new no_quorum_demote (rh#1850078) + +------------------------------------------------------------------- +Mon Aug 03 16:46:25 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20200306.9571749: +- scheduling: overhaul the whole thing (bsc#1143064) + +------------------------------------------------------------------- +Mon Aug 03 16:05:11 UTC 2020 - Yan Gao <[email protected]> + +- Update to version 1.4.1+20200130.7e958a9: +- Doc: add environment section to man-page + +------------------------------------------------------------------- Old: ---- sbd-1.4.1+20200113.4b617a1.tar.xz New: ---- sbd-1.4.1+20200819.4a02ef2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sbd.spec ++++++ --- /var/tmp/diff_new_pack.PTJ5CI/_old 2020-08-29 20:42:30.197468996 +0200 +++ /var/tmp/diff_new_pack.PTJ5CI/_new 2020-08-29 20:42:30.201468998 +0200 @@ -1,7 +1,7 @@ # # spec file for package sbd # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2013 Lars Marowsky-Bree # # All modifications and additions to the file contributed by third parties @@ -22,13 +22,23 @@ %define _fillupdir /var/adm/fillup-templates %endif +%ifarch s390x s390 +# minimum timeout on LPAR diag288 watchdog is 15s +%global watchdog_timeout_default 15 +%else +%global watchdog_timeout_default 5 +%endif + +%global sync_resource_startup_default no +%global sync_resource_startup_sysconfig no + Name: sbd -Version: 1.4.1+20200113.4b617a1 +Version: 1.4.1+20200819.4a02ef2 Release: 0 Summary: Storage-based death License: GPL-2.0-or-later Group: Productivity/Clustering/HA -Url: https://github.com/ClusterLabs/sbd +URL: https://github.com/ClusterLabs/sbd Source: %{name}-%{version}.tar.xz Patch1: bsc#1140065-Fix-sbd-cluster-exit-if-cmap-is-disconnected.patch BuildRequires: autoconf @@ -64,15 +74,12 @@ %prep %autosetup -n %{name}-%{version} -p1 -%ifarch s390x s390 -sed -i src/sbd.sysconfig -e "s/Default: 5/Default: 15/" -sed -i src/sbd.sysconfig -e "s/SBD_WATCHDOG_TIMEOUT=5/SBD_WATCHDOG_TIMEOUT=15/" -%endif - %build ./autogen.sh -%configure +%configure --with-watchdog-timeout-default=%{watchdog_timeout_default} \ + --with-sync-resource-startup-default=%{sync_resource_startup_default} \ + --with-sync-resource-startup-sysconfig=%{sync_resource_startup_sysconfig} make %{?_smp_mflags} %install ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.PTJ5CI/_old 2020-08-29 20:42:30.253469019 +0200 +++ /var/tmp/diff_new_pack.PTJ5CI/_new 2020-08-29 20:42:30.257469021 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/ClusterLabs/sbd.git</param> - <param name="changesrevision">b6003594e7b71fbb0c0bb8db705b31f9ea5f6a02</param> + <param name="changesrevision">4a02ef21e43551ef10ca596ef9cbee5f0fb0f668</param> </service> </servicedata> \ No newline at end of file ++++++ bsc#1140065-Fix-sbd-cluster-exit-if-cmap-is-disconnected.patch ++++++ --- /var/tmp/diff_new_pack.PTJ5CI/_old 2020-08-29 20:42:30.265469025 +0200 +++ /var/tmp/diff_new_pack.PTJ5CI/_new 2020-08-29 20:42:30.265469025 +0200 @@ -1,10 +1,10 @@ -diff --git a/src/sbd-cluster.c b/src/sbd-cluster.c -index 541212f..b315e8b 100644 ---- a/src/sbd-cluster.c -+++ b/src/sbd-cluster.c +Index: sbd-1.4.1+20200807.7c21899/src/sbd-cluster.c +=================================================================== +--- sbd-1.4.1+20200807.7c21899.orig/src/sbd-cluster.c ++++ sbd-1.4.1+20200807.7c21899/src/sbd-cluster.c @@ -35,6 +35,18 @@ - #if CHECK_TWO_NODE + #if CHECK_TWO_NODE || CHECK_QDEVICE_SYNC_TIMEOUT #include <glib-unix.h> +// available since glib 2.58 +#ifndef G_SOURCE_FUNC @@ -29,15 +29,16 @@ static gboolean sbd_remote_check(gpointer user_data); static long unsigned int find_pacemaker_remote(void); static void sbd_membership_destroy(gpointer user_data); -@@ -168,10 +181,19 @@ static void sbd_cmap_notify_fn( +@@ -292,10 +305,19 @@ static void sbd_cmap_notify_fn( } static gboolean -cmap_dispatch_callback (gpointer user_data) +-{ +cmap_dispatch_callback (gint cmap_fd, + GIOCondition condition, + gpointer user_data) - { ++{ + /* CMAP connection lost */ + if (condition & G_IO_HUP) { + cl_log(LOG_WARNING, "CMAP service connection lost\n"); @@ -51,7 +52,7 @@ } static void -@@ -222,7 +244,7 @@ sbd_get_two_node(void) +@@ -370,7 +392,7 @@ verify_against_cmap_config(void) cl_log(LOG_WARNING, "Couldn't create source for cmap\n"); goto out; } @@ -60,7 +61,7 @@ g_source_attach(cmap_source, NULL); } -@@ -533,6 +555,15 @@ find_pacemaker_remote(void) +@@ -733,6 +755,15 @@ clean_up(int rc) * just to be back where we started */ #endif @@ -76,11 +77,11 @@ return; } -diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c -index abde4e5..fcb867c 100644 ---- a/src/sbd-inquisitor.c -+++ b/src/sbd-inquisitor.c -@@ -526,6 +526,20 @@ void inquisitor_child(void) +Index: sbd-1.4.1+20200807.7c21899/src/sbd-inquisitor.c +=================================================================== +--- sbd-1.4.1+20200807.7c21899.orig/src/sbd-inquisitor.c ++++ sbd-1.4.1+20200807.7c21899/src/sbd-inquisitor.c +@@ -532,6 +532,20 @@ void inquisitor_child(void) break; } } @@ -101,10 +102,10 @@ } cleanup_servant_by_pid(pid); } -diff --git a/src/sbd.h b/src/sbd.h -index 3b05a11..45244ab 100644 ---- a/src/sbd.h -+++ b/src/sbd.h +Index: sbd-1.4.1+20200807.7c21899/src/sbd.h +=================================================================== +--- sbd-1.4.1+20200807.7c21899.orig/src/sbd.h ++++ sbd-1.4.1+20200807.7c21899/src/sbd.h @@ -62,6 +62,9 @@ /* exit status for pcmk-servant */ #define EXIT_PCMK_SERVANT_GRACEFUL_SHUTDOWN 30 ++++++ sbd-1.4.1+20200113.4b617a1.tar.xz -> sbd-1.4.1+20200819.4a02ef2.tar.xz ++++++ ++++ 2813 lines of diff (skipped)
