Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sbd for openSUSE:Factory checked in
at 2022-12-12 17:40:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sbd (Old)
and /work/SRC/openSUSE:Factory/.sbd.new.1835 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sbd"
Mon Dec 12 17:40:02 2022 rev:46 rq:1042335 version:1.5.1+20221128.8ec8e01
Changes:
--------
--- /work/SRC/openSUSE:Factory/sbd/sbd.changes 2022-09-12 19:08:51.442639062
+0200
+++ /work/SRC/openSUSE:Factory/.sbd.new.1835/sbd.changes 2022-12-12
17:42:11.285957806 +0100
@@ -1,0 +2,12 @@
+Fri Dec 02 08:12:43 UTC 2022 - Yan Gao <y...@suse.com>
+
+- Update to version 1.5.1+20221128.8ec8e01:
+- sbd-inquisitor: fail startup if pacemaker integration is disabled while
SBD_SYNC_RESOURCE_STARTUP is conflicting (bsc#1204319)
+- sbd-inquisitor: do not warn about startup syncing if pacemaker integration
is even intentionally disabled (bsc#1204319)
+- sbd-inquisitor: log a warning if SBD_PACEMAKER is overridden by -P or -PP
option (bsc#1204319)
+- sbd-inquisitor: ensure a log info only tells the fact about how
SBD_PACEMAKER is set (bsc#1204319)
+
+- Rebase:
+ * bsc#1180966-0001-Log-sbd-inquisitor-downgrade-the-warning-about-SBD_S.patch
+
+-------------------------------------------------------------------
Old:
----
sbd-1.5.1+20220716.c43276f.tar.xz
New:
----
sbd-1.5.1+20221128.8ec8e01.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sbd.spec ++++++
--- /var/tmp/diff_new_pack.Z6RRpb/_old 2022-12-12 17:42:11.737960348 +0100
+++ /var/tmp/diff_new_pack.Z6RRpb/_new 2022-12-12 17:42:11.749960415 +0100
@@ -47,7 +47,7 @@
%global sync_resource_startup_sysconfig ""
Name: sbd
-Version: 1.5.1+20220716.c43276f
+Version: 1.5.1+20221128.8ec8e01
Release: 0
Summary: Storage-based death
License: GPL-2.0-or-later
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.Z6RRpb/_old 2022-12-12 17:42:11.833960887 +0100
+++ /var/tmp/diff_new_pack.Z6RRpb/_new 2022-12-12 17:42:11.837960909 +0100
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/ClusterLabs/sbd.git</param>
- <param
name="changesrevision">c43276f51abfff2098158728ced1838b2a1f3e9f</param>
+ <param
name="changesrevision">bacb6e78a9bd06448cc82959b195db8e3ff98d7d</param>
</service>
</servicedata>
(No newline at EOF)
++++++
bsc#1180966-0001-Log-sbd-inquisitor-downgrade-the-warning-about-SBD_S.patch
++++++
--- /var/tmp/diff_new_pack.Z6RRpb/_old 2022-12-12 17:42:11.857961022 +0100
+++ /var/tmp/diff_new_pack.Z6RRpb/_new 2022-12-12 17:42:11.861961044 +0100
@@ -8,20 +8,17 @@
src/sbd-inquisitor.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c
-index c943030..b527218 100644
---- a/src/sbd-inquisitor.c
-+++ b/src/sbd-inquisitor.c
-@@ -1122,7 +1122,7 @@ int main(int argc, char **argv, char **envp)
+Index: sbd-1.5.1+20221128.8ec8e01/src/sbd-inquisitor.c
+===================================================================
+--- sbd-1.5.1+20221128.8ec8e01.orig/src/sbd-inquisitor.c
++++ sbd-1.5.1+20221128.8ec8e01/src/sbd-inquisitor.c
+@@ -1304,7 +1304,7 @@ int main(int argc, char **argv, char **e
}
#else
- if (!sync_resource_startup) {
+ if (check_pcmk && !sync_resource_startup) {
- cl_log(LOG_WARNING, "SBD built against pacemaker supporting "
+ cl_log(LOG_NOTICE, "SBD built against pacemaker supporting "
"pacemakerd-API. Should think about enabling "
"SBD_SYNC_RESOURCE_STARTUP.");
- }
---
-2.26.2
-
+
++++++ sbd-1.5.1+20220716.c43276f.tar.xz -> sbd-1.5.1+20221128.8ec8e01.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sbd-1.5.1+20220716.c43276f/src/sbd-inquisitor.c
new/sbd-1.5.1+20221128.8ec8e01/src/sbd-inquisitor.c
--- old/sbd-1.5.1+20220716.c43276f/src/sbd-inquisitor.c 2022-07-16
04:38:08.000000000 +0200
+++ new/sbd-1.5.1+20221128.8ec8e01/src/sbd-inquisitor.c 2022-11-28
16:17:49.000000000 +0100
@@ -25,6 +25,7 @@
int disk_priority = 1;
int check_pcmk = 1;
int check_cluster = 1;
+int has_check_pcmk_env = false;
int disk_count = 0;
int servant_count = 0;
int servant_restart_interval = 5;
@@ -949,8 +950,10 @@
if(value) {
check_pcmk = crm_is_true(value);
check_cluster = crm_is_true(value);
+
+ has_check_pcmk_env = true;
}
- cl_log(LOG_INFO, "Enable pacemaker checks: %d (%s)", (int)check_pcmk,
value?value:"default");
+ cl_log(LOG_INFO, "SBD_PACEMAKER set to: %d (%s)", (int)check_pcmk,
value?value:"default");
value = get_env_option("SBD_STARTMODE");
if(value == NULL) {
@@ -1202,7 +1205,17 @@
}
if (P_count > 0) {
- check_pcmk = arg_enabled(P_count);
+ int check_pcmk_arg = arg_enabled(P_count);
+
+ if (has_check_pcmk_env && check_pcmk_arg != check_pcmk) {
+ cl_log(LOG_WARNING, "Pacemaker integration is %s: "
+ "SBD_PACEMAKER=%s is overridden by %s
option. "
+ "It's recommended to only use
SBD_PACEMAKER.",
+ check_pcmk_arg? "enabled" : "disabled",
+ check_pcmk? "yes" : "no",
+ check_pcmk_arg? "-P" : "-PP");
+ }
+ check_pcmk = check_pcmk_arg;
}
if ((disk_count > 0) && (strlen(local_uname) > SECTOR_NAME_MAX)) {
@@ -1276,10 +1289,16 @@
goto out;
}
#else
- if (!sync_resource_startup) {
+ if (check_pcmk && !sync_resource_startup) {
cl_log(LOG_WARNING, "SBD built against pacemaker supporting "
"pacemakerd-API. Should think about enabling "
"SBD_SYNC_RESOURCE_STARTUP.");
+
+ } else if (!check_pcmk && sync_resource_startup) {
+ fprintf(stderr, "Set SBD_PACEMAKER=yes to allow resource startup
syncing. "
+ "Otherwise explicitly set SBD_SYNC_RESOURCE_STARTUP=no if
to intentionally disable.\n");
+ exit_status = -1;
+ goto out;
}
#endif
}
