Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-12-SP2:Update
pacemaker
pacemaker-libcrmcommon-lower-watchdog-messages....
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File pacemaker-libcrmcommon-lower-watchdog-messages.patch of Package pacemaker
commit 91a4a006cd5c15c04329737978abb842e80ea8b8 Author: Ken Gaillot <kgaillot@redhat.com> Date: Thu Oct 26 10:36:11 2017 -0500 Log: libcrmcommon: lower watchdog messages when default Previously, if a watchdog was left unconfigured by default, the log would be: notice: check_sbd_timeout: Watchdog may be enabled but stonith-watchdog-timeout is disabled: (null) info: check_sbd_timeout: Watchdog functionality is consistent: (null) delay exceeds timeout of -1ms Now, a single debug message is printed in this case. diff --git a/lib/common/watchdog.c b/lib/common/watchdog.c index 4c4abc1e2..7e1434953 100644 --- a/lib/common/watchdog.c +++ b/lib/common/watchdog.c @@ -254,24 +254,31 @@ crm_get_sbd_timeout(void) gboolean check_sbd_timeout(const char *value) { - long sbd_timeout = crm_get_sbd_timeout(); - long st_timeout = crm_get_msec(value); + long st_timeout = value? crm_get_msec(value) : 0; - if(value == NULL || st_timeout <= 0) { - crm_notice("Watchdog may be enabled but stonith-watchdog-timeout is disabled: %s", value); + if (st_timeout <= 0) { + crm_debug("Watchdog may be enabled but stonith-watchdog-timeout is disabled (%s)", + value? value : "default"); - } else if(pcmk_locate_sbd() == 0) { - do_crm_log_always(LOG_EMERG, "Shutting down: stonith-watchdog-timeout is configured (%ldms) but SBD is not active", st_timeout); + } else if (pcmk_locate_sbd() == 0) { + do_crm_log_always(LOG_EMERG, + "Shutting down: stonith-watchdog-timeout configured (%s) but SBD not active", + value); crm_exit(DAEMON_RESPAWN_STOP); return FALSE; - } else if(st_timeout < sbd_timeout) { - do_crm_log_always(LOG_EMERG, "Shutting down: stonith-watchdog-timeout (%ldms) is too short (must be greater than %ldms)", - st_timeout, sbd_timeout); - crm_exit(DAEMON_RESPAWN_STOP); - return FALSE; + } else { + long sbd_timeout = crm_get_sbd_timeout(); + + if (st_timeout < sbd_timeout) { + do_crm_log_always(LOG_EMERG, + "Shutting down: stonith-watchdog-timeout (%s) too short (must be >%ldms)", + value, sbd_timeout); + crm_exit(DAEMON_RESPAWN_STOP); + return FALSE; + } + crm_info("Watchdog configured with stonith-watchdog-timeout %s and SBD timeout %ldms", + value, sbd_timeout); } - - crm_info("Watchdog functionality is consistent: %s delay exceeds timeout of %ldms", value, sbd_timeout); return TRUE; }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor