From 463eb8e36e2d2bf10a0e37938e0924ea6699f041 Mon Sep 17 00:00:00 2001 From: Ken Gaillot Date: Thu, 30 May 2019 08:37:52 -0500 Subject: [PATCH] Low: libpe_status: offer compile-time option to change concurrent-fencing default We most likely want to make concurrent-fencing default to true at some point. For now, offer that possibility via a compile-time constant, for experimenting. --- lib/pengine/common.c | 8 +++++++- lib/pengine/status.c | 3 +++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/pengine/common.c b/lib/pengine/common.c index 9513633..3a283b4 100644 --- a/lib/pengine/common.c +++ b/lib/pengine/common.c @@ -95,7 +95,13 @@ static pe_cluster_option pe_opts[] = { "How long to wait for the STONITH action (reboot,on,off) to complete", NULL }, { XML_ATTR_HAVE_WATCHDOG, NULL, "boolean", NULL, "false", &check_boolean, "Enable watchdog integration", "Set automatically by the cluster if SBD is detected. User configured values are ignored." }, - { "concurrent-fencing", NULL, "boolean", NULL, "false", &check_boolean, + { "concurrent-fencing", NULL, "boolean", NULL, +#ifdef DEFAULT_CONCURRENT_FENCING_TRUE + "true", +#else + "false", +#endif + &check_boolean, "Allow performing fencing operations in parallel", NULL }, { "startup-fencing", NULL, "boolean", NULL, "true", &check_boolean, "STONITH unseen nodes", "Advanced Use Only! Not using the default is very unsafe!" }, diff --git a/lib/pengine/status.c b/lib/pengine/status.c index 3ccfac4..a8b0947 100644 --- a/lib/pengine/status.c +++ b/lib/pengine/status.c @@ -354,6 +354,9 @@ set_working_set_defaults(pe_working_set_t * data_set) set_bit(data_set->flags, pe_flag_stop_rsc_orphans); set_bit(data_set->flags, pe_flag_symmetric_cluster); set_bit(data_set->flags, pe_flag_stop_action_orphans); +#ifdef DEFAULT_CONCURRENT_FENCING_TRUE + set_bit(data_set->flags, pe_flag_concurrent_fencing); +#endif } resource_t * -- 1.8.3.1