Skip to content

Fix: sbd-inquisitor: fail startup if pacemaker integration is disabled while SBD_SYNC_RESOURCE_STARTUP is conflicting #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wenningerk merged 4 commits into from
Nov 28, 2022
Merged

Fix: sbd-inquisitor: fail startup if pacemaker integration is disabled while SBD_SYNC_RESOURCE_STARTUP is conflicting #149

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c25f8df
Log: sbd-inquisitor: ensure a log info only tells the fact about how …
gao-yan Nov 23, 2022
ac1cfbb
Log: sbd-inquisitor: log a warning if SBD_PACEMAKER is overridden by …
gao-yan Nov 23, 2022
82282ac
Log: sbd-inquisitor: do not warn about startup syncing if pacemaker i…
gao-yan Nov 23, 2022
bacb6e7
Fix: sbd-inquisitor: fail startup if pacemaker integration is disable…
gao-yan Nov 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions src/sbd-inquisitor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ static struct servants_list_item *servants_leader = NULL;
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;
Expand Down Expand Up @@ -949,8 +950,10 @@ int main(int argc, char **argv, char **envp)
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) {
Expand Down Expand Up @@ -1202,7 +1205,17 @@ int main(int argc, char **argv, char **envp)
}

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)) {
Expand Down Expand Up @@ -1276,10 +1289,16 @@ int main(int argc, char **argv, char **envp)
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
}
Expand Down