File bsc#1204319-0004-Fix-sbd-inquisitor-fail-startup-if-pacemaker-integra.patch of Package sbd.27493
From bacb6e78a9bd06448cc82959b195db8e3ff98d7d Mon Sep 17 00:00:00 2001
From: "Gao,Yan" <ygao@suse.com>
Date: Wed, 23 Nov 2022 17:43:40 +0100
Subject: [PATCH 4/4] Fix: sbd-inquisitor: fail startup if pacemaker
integration is disabled while SBD_SYNC_RESOURCE_STARTUP is conflicting
And tell user to fix the configuration by either enabling SBD_PACEMAKER
or explicitly disabling SBD_SYNC_RESOURCE_STARTUP. Otherwise startup of
pacemaker would be hanging forever, since pacemaker only knows about
SBD_SYNC_RESOURCE_STARTUP.
---
src/sbd-inquisitor.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/sbd-inquisitor.c b/src/sbd-inquisitor.c
index 9f2de20..d917cd1 100644
--- a/src/sbd-inquisitor.c
+++ b/src/sbd-inquisitor.c
@@ -1293,6 +1293,12 @@ int main(int argc, char **argv, char **envp)
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
}
--
2.35.3