From 38752691c1af12cfeee17f106533aca584b55036 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 11 Dec 2023 17:02:39 +0300 Subject: [PATCH] import resource-agents-4.9.0-48.el8_9 --- .../bz2039692-mysql-1-replication-fixes.patch | 70 ++++++++++ ...692-mysql-2-fix-demoted-score-bounce.patch | 32 +++++ ...caddr-1-support-policy-based-routing.patch | 84 ++++++++++++ ...ddr2-IPsrcaddr-2-fix-table-parameter.patch | 35 +++++ ...IPsrcaddr-3-dont-use-table-parameter.patch | 79 +++++++++++ ...lvmlockd-add-use_lvmlockd-if-missing.patch | 42 ++++++ ...-dont-log-iface-doesnt-exist-monitor.patch | 24 ++++ ...-events-1-fix-no-transition-summary.patch} | 0 ...181019-azure-events-2-improve-logic.patch} | 0 ...esystem-fail-efs-utils-not-installed.patch | 23 ++++ ...243-Filesystem-1-improve-stop-action.patch | 125 ++++++++++++++++++ ...stem-2-fix-incorrect-parameter-types.patch | 49 +++++++ ...tem-3-fix-signal_delay-default-value.patch | 23 ++++ SPECS/resource-agents.spec | 57 +++++++- 14 files changed, 638 insertions(+), 5 deletions(-) create mode 100644 SOURCES/bz2039692-mysql-1-replication-fixes.patch create mode 100644 SOURCES/bz2039692-mysql-2-fix-demoted-score-bounce.patch create mode 100644 SOURCES/bz2040110-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch create mode 100644 SOURCES/bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch create mode 100644 SOURCES/bz2040110-IPaddr2-IPsrcaddr-3-dont-use-table-parameter.patch create mode 100644 SOURCES/bz2149970-lvmlockd-add-use_lvmlockd-if-missing.patch create mode 100644 SOURCES/bz2154727-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch rename SOURCES/{bz2182761-azure-events-1-fix-no-transition-summary.patch => bz2181019-azure-events-1-fix-no-transition-summary.patch} (100%) rename SOURCES/{bz2182761-azure-events-2-improve-logic.patch => bz2181019-azure-events-2-improve-logic.patch} (100%) create mode 100644 SOURCES/bz2183152-Filesystem-fail-efs-utils-not-installed.patch create mode 100644 SOURCES/bz2189243-Filesystem-1-improve-stop-action.patch create mode 100644 SOURCES/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch create mode 100644 SOURCES/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch diff --git a/SOURCES/bz2039692-mysql-1-replication-fixes.patch b/SOURCES/bz2039692-mysql-1-replication-fixes.patch new file mode 100644 index 0000000..e086e07 --- /dev/null +++ b/SOURCES/bz2039692-mysql-1-replication-fixes.patch @@ -0,0 +1,70 @@ +From 706b48fd93a75a582c538013aea1418b6ed69dd0 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 9 Mar 2023 15:57:59 +0100 +Subject: [PATCH] mysql: promotable fixes to avoid nodes getting bounced around + by setting -v 1/-v 2, and added OCF_CHECK_LEVEL=10 for promotable resources + to be able to distinguish between promoted and not + +--- + heartbeat/mysql | 19 +++++++++++++------ + 1 file changed, 13 insertions(+), 6 deletions(-) + +diff --git a/heartbeat/mysql b/heartbeat/mysql +index 9ab49ab20e..29ed427319 100755 +--- a/heartbeat/mysql ++++ b/heartbeat/mysql +@@ -757,6 +757,10 @@ mysql_monitor() { + status_loglevel="info" + fi + ++ if ocf_is_ms; then ++ OCF_CHECK_LEVEL=10 ++ fi ++ + mysql_common_status $status_loglevel + rc=$? + +@@ -777,7 +781,13 @@ mysql_monitor() { + return $rc + fi + +- if [ $OCF_CHECK_LEVEL -gt 0 -a -n "$OCF_RESKEY_test_table" ]; then ++ if [ $OCF_CHECK_LEVEL -eq 10 ]; then ++ if [ -z "$OCF_RESKEY_test_table" ]; then ++ ocf_exit_reason "test_table not set" ++ return $OCF_ERR_CONFIGURED ++ ++ fi ++ + # Check if this instance is configured as a slave, and if so + # check slave status + if is_slave; then +@@ -795,18 +805,16 @@ mysql_monitor() { + ocf_exit_reason "Failed to select from $test_table"; + return $OCF_ERR_GENERIC; + fi +- else +- # In case no exnteded tests are enabled and we are in master/slave mode _always_ set the master score to 1 if we reached this point +- ocf_is_ms && $CRM_MASTER -v 1 + fi + + if ocf_is_ms && ! get_read_only; then + ocf_log debug "MySQL monitor succeeded (master)"; + # Always set master score for the master +- $CRM_MASTER -v 2 ++ $CRM_MASTER -v $((${OCF_RESKEY_max_slave_lag}+1)) + return $OCF_RUNNING_MASTER + else + ocf_log debug "MySQL monitor succeeded"; ++ ocf_is_ms && $CRM_MASTER -v 1 + return $OCF_SUCCESS + fi + } +@@ -873,7 +881,6 @@ mysql_start() { + # preference set by the administrator. We choose a low + # greater-than-zero preference. + $CRM_MASTER -v 1 +- + fi + + # Initial monitor action diff --git a/SOURCES/bz2039692-mysql-2-fix-demoted-score-bounce.patch b/SOURCES/bz2039692-mysql-2-fix-demoted-score-bounce.patch new file mode 100644 index 0000000..30815b4 --- /dev/null +++ b/SOURCES/bz2039692-mysql-2-fix-demoted-score-bounce.patch @@ -0,0 +1,32 @@ +From 34483f8029ea9ab25220cfee71d53adaf5aacaa0 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 14 Jun 2023 14:37:01 +0200 +Subject: [PATCH] mysql: fix promotion_score bouncing between ~3600 and 1 on + demoted nodes + +--- + heartbeat/mysql | 11 ----------- + 1 file changed, 11 deletions(-) + +diff --git a/heartbeat/mysql b/heartbeat/mysql +index 29ed42731..1df2fc0f2 100755 +--- a/heartbeat/mysql ++++ b/heartbeat/mysql +@@ -517,17 +517,6 @@ check_slave() { + + exit $OCF_ERR_INSTALLED + fi +- elif ocf_is_ms; then +- # Even if we're not set to evict lagging slaves, we can +- # still use the seconds behind master value to set our +- # master preference. +- local master_pref +- master_pref=$((${OCF_RESKEY_max_slave_lag}-${secs_behind})) +- if [ $master_pref -lt 0 ]; then +- # Sanitize a below-zero preference to just zero +- master_pref=0 +- fi +- $CRM_MASTER -v $master_pref + fi + + # is the slave ok to have a VIP on it diff --git a/SOURCES/bz2040110-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch new file mode 100644 index 0000000..0607ddb --- /dev/null +++ b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch @@ -0,0 +1,84 @@ +From 4d87bcfe5df8a1e40ee945e095ac9e7cca147ec4 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 29 Jun 2022 10:26:25 +0200 +Subject: [PATCH] IPaddr2/IPsrcaddr: add/modify table parameter to be able to + find interface while using policy based routing + +--- + heartbeat/IPaddr2 | 12 ++++++++++++ + heartbeat/IPsrcaddr | 5 ++++- + heartbeat/findif.sh | 2 +- + 3 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2 +index 97a7431a2..e8384c586 100755 +--- a/heartbeat/IPaddr2 ++++ b/heartbeat/IPaddr2 +@@ -73,6 +73,7 @@ OCF_RESKEY_ip_default="" + OCF_RESKEY_cidr_netmask_default="" + OCF_RESKEY_broadcast_default="" + OCF_RESKEY_iflabel_default="" ++OCF_RESKEY_table_default="" + OCF_RESKEY_cidr_netmask_default="" + OCF_RESKEY_lvs_support_default=false + OCF_RESKEY_lvs_ipv6_addrlabel_default=false +@@ -97,6 +98,7 @@ OCF_RESKEY_network_namespace_default="" + : ${OCF_RESKEY_cidr_netmask=${OCF_RESKEY_cidr_netmask_default}} + : ${OCF_RESKEY_broadcast=${OCF_RESKEY_broadcast_default}} + : ${OCF_RESKEY_iflabel=${OCF_RESKEY_iflabel_default}} ++: ${OCF_RESKEY_table=${OCF_RESKEY_table_default}} + : ${OCF_RESKEY_lvs_support=${OCF_RESKEY_lvs_support_default}} + : ${OCF_RESKEY_lvs_ipv6_addrlabel=${OCF_RESKEY_lvs_ipv6_addrlabel_default}} + : ${OCF_RESKEY_lvs_ipv6_addrlabel_value=${OCF_RESKEY_lvs_ipv6_addrlabel_value_default}} +@@ -239,6 +241,16 @@ If a label is specified in nic name, this parameter has no effect. + + + ++ ++ ++Table to use to lookup which interface to use for the IP. ++ ++This can be used for policy based routing. See man ip-rule(8). ++ ++Table ++ ++ ++ + + + Enable support for LVS Direct Routing configurations. In case a IP +diff --git a/heartbeat/IPsrcaddr b/heartbeat/IPsrcaddr +index 1bd41a930..cf106cc34 100755 +--- a/heartbeat/IPsrcaddr ++++ b/heartbeat/IPsrcaddr +@@ -155,13 +155,16 @@ Metric. Only needed if incorrect metric value is used. + + + +-Table to modify. E.g. "local". ++Table to modify and use for interface lookup. E.g. "local". + + The table has to have a route matching the "destination" parameter. ++ ++This can be used for policy based routing. See man ip-rule(8). + + Table + + ++ + + + +diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh +index 66bc6d56a..1a40cc9a4 100644 +--- a/heartbeat/findif.sh ++++ b/heartbeat/findif.sh +@@ -32,7 +32,7 @@ prefixcheck() { + getnetworkinfo() + { + local line netinfo +- ip -o -f inet route list match $OCF_RESKEY_ip table local scope host | (while read line; ++ ip -o -f inet route list match $OCF_RESKEY_ip table "${OCF_RESKEY_table=local}" scope host | (while read line; + do + netinfo=`echo $line | awk '{print $2}'` + case $netinfo in diff --git a/SOURCES/bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch new file mode 100644 index 0000000..9cfc808 --- /dev/null +++ b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch @@ -0,0 +1,35 @@ +From da9e8e691f39494e14f8f11173b6ab6433384396 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 20 Jun 2023 14:19:23 +0200 +Subject: [PATCH] findif.sh: fix table parameter so it uses main table by + default + +--- + heartbeat/findif.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh +index 1a40cc9a4b..6c04c98c19 100644 +--- a/heartbeat/findif.sh ++++ b/heartbeat/findif.sh +@@ -32,7 +32,7 @@ prefixcheck() { + getnetworkinfo() + { + local line netinfo +- ip -o -f inet route list match $OCF_RESKEY_ip table "${OCF_RESKEY_table=local}" scope host | (while read line; ++ ip -o -f inet route list match $OCF_RESKEY_ip table "${OCF_RESKEY_table:=main}" scope host | (while read line; + do + netinfo=`echo $line | awk '{print $2}'` + case $netinfo in +@@ -215,9 +215,9 @@ findif() + fi + if [ -n "$nic" ] ; then + # NIC supports more than two. +- set -- $(ip -o -f $family route list match $match $scope | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') ++ set -- $(ip -o -f $family route list match $match $scope table "${OCF_RESKEY_table:=main}" | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') + else +- set -- $(ip -o -f $family route list match $match $scope | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') ++ set -- $(ip -o -f $family route list match $match $scope table "${OCF_RESKEY_table:=main}" | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') + fi + if [ $# = 0 ] ; then + case $OCF_RESKEY_ip in diff --git a/SOURCES/bz2040110-IPaddr2-IPsrcaddr-3-dont-use-table-parameter.patch b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-3-dont-use-table-parameter.patch new file mode 100644 index 0000000..ef5d8d5 --- /dev/null +++ b/SOURCES/bz2040110-IPaddr2-IPsrcaddr-3-dont-use-table-parameter.patch @@ -0,0 +1,79 @@ +From cf2fd2a9cf06dc2e915f2fb5dbcc5e09e907a6df Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 5 Oct 2023 11:53:18 +0200 +Subject: [PATCH] findif.sh: dont use table parameter as it returns no netmask + (tested with main/local/custom tables) + +--- + heartbeat/IPaddr2 | 12 ------------ + heartbeat/findif.sh | 8 ++++---- + 2 files changed, 4 insertions(+), 16 deletions(-) + +diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2 +index e8384c5866..97a7431a24 100755 +--- a/heartbeat/IPaddr2 ++++ b/heartbeat/IPaddr2 +@@ -73,7 +73,6 @@ OCF_RESKEY_ip_default="" + OCF_RESKEY_cidr_netmask_default="" + OCF_RESKEY_broadcast_default="" + OCF_RESKEY_iflabel_default="" +-OCF_RESKEY_table_default="" + OCF_RESKEY_cidr_netmask_default="" + OCF_RESKEY_lvs_support_default=false + OCF_RESKEY_lvs_ipv6_addrlabel_default=false +@@ -98,7 +97,6 @@ OCF_RESKEY_network_namespace_default="" + : ${OCF_RESKEY_cidr_netmask=${OCF_RESKEY_cidr_netmask_default}} + : ${OCF_RESKEY_broadcast=${OCF_RESKEY_broadcast_default}} + : ${OCF_RESKEY_iflabel=${OCF_RESKEY_iflabel_default}} +-: ${OCF_RESKEY_table=${OCF_RESKEY_table_default}} + : ${OCF_RESKEY_lvs_support=${OCF_RESKEY_lvs_support_default}} + : ${OCF_RESKEY_lvs_ipv6_addrlabel=${OCF_RESKEY_lvs_ipv6_addrlabel_default}} + : ${OCF_RESKEY_lvs_ipv6_addrlabel_value=${OCF_RESKEY_lvs_ipv6_addrlabel_value_default}} +@@ -241,16 +239,6 @@ If a label is specified in nic name, this parameter has no effect. + + + +- +- +-Table to use to lookup which interface to use for the IP. +- +-This can be used for policy based routing. See man ip-rule(8). +- +-Table +- +- +- + + + Enable support for LVS Direct Routing configurations. In case a IP +diff --git a/heartbeat/findif.sh b/heartbeat/findif.sh +index 6c04c98c19..5f1c19ec3c 100644 +--- a/heartbeat/findif.sh ++++ b/heartbeat/findif.sh +@@ -32,7 +32,7 @@ prefixcheck() { + getnetworkinfo() + { + local line netinfo +- ip -o -f inet route list match $OCF_RESKEY_ip table "${OCF_RESKEY_table:=main}" scope host | (while read line; ++ ip -o -f inet route list match $OCF_RESKEY_ip scope host | (while read line; + do + netinfo=`echo $line | awk '{print $2}'` + case $netinfo in +@@ -210,14 +210,14 @@ findif() + fi + findif_check_params $family || return $? + +- if [ -n "$netmask" ] ; then ++ if [ -n "$netmask" ]; then + match=$match/$netmask + fi + if [ -n "$nic" ] ; then + # NIC supports more than two. +- set -- $(ip -o -f $family route list match $match $scope table "${OCF_RESKEY_table:=main}" | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') ++ set -- $(ip -o -f $family route list match $match $scope | grep "dev $nic " | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') + else +- set -- $(ip -o -f $family route list match $match $scope table "${OCF_RESKEY_table:=main}" | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') ++ set -- $(ip -o -f $family route list match $match $scope | awk 'BEGIN{best=0} /\// { mask=$1; sub(".*/", "", mask); if( int(mask)>=best ) { best=int(mask); best_ln=$0; } } END{print best_ln}') + fi + if [ $# = 0 ] ; then + case $OCF_RESKEY_ip in diff --git a/SOURCES/bz2149970-lvmlockd-add-use_lvmlockd-if-missing.patch b/SOURCES/bz2149970-lvmlockd-add-use_lvmlockd-if-missing.patch new file mode 100644 index 0000000..ef5e34e --- /dev/null +++ b/SOURCES/bz2149970-lvmlockd-add-use_lvmlockd-if-missing.patch @@ -0,0 +1,42 @@ +From 2695888c983df331b0fee407a5c69c493a360313 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 30 Nov 2022 12:07:05 +0100 +Subject: [PATCH] lvmlockd: add "use_lvmlockd = 1" if it's commented out or + missing + +--- + heartbeat/lvmlockd | 17 +++++++++++++---- + 1 file changed, 13 insertions(+), 4 deletions(-) + +diff --git a/heartbeat/lvmlockd b/heartbeat/lvmlockd +index dc7bd2d7e..f4b299f28 100755 +--- a/heartbeat/lvmlockd ++++ b/heartbeat/lvmlockd +@@ -180,14 +180,23 @@ setup_lvm_config() + lock_type=$(echo "$out" | cut -d'=' -f2) + + if [ -z "$use_lvmlockd" ]; then +- ocf_exit_reason "\"use_lvmlockd\" not set in /etc/lvm/lvm.conf ..." +- exit $OCF_ERR_CONFIGURED +- fi ++ ocf_log info "adding \"use_lvmlockd=1\" to /etc/lvm/lvm.conf ..." ++ cat >> /etc/lvm/lvm.conf << EOF ++ ++global { ++ use_lvmlockd = 1 ++} ++EOF + +- if [ -n "$use_lvmlockd" ] && [ "$use_lvmlockd" != 1 ] ; then ++ if [ $? -ne 0 ]; then ++ ocf_exit_reason "unable to add \"use_lvmlockd=1\" to /etc/lvm/lvm.conf ..." ++ exit $OCF_ERR_CONFIGURED ++ fi ++ elif [ "$use_lvmlockd" != 1 ] ; then + ocf_log info "setting \"use_lvmlockd=1\" in /etc/lvm/lvm.conf ..." + sed -i 's,^[[:blank:]]*use_lvmlockd[[:blank:]]*=.*,\ \ \ \ use_lvmlockd = 1,g' /etc/lvm/lvm.conf + fi ++ + if [ -n "$lock_type" ] ; then + # locking_type was removed from config in v2.03 + ocf_version_cmp "$(lvmconfig --version | awk '/LVM ver/ {sub(/\(.*/, "", $3); print $3}')" "2.03" diff --git a/SOURCES/bz2154727-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch b/SOURCES/bz2154727-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch new file mode 100644 index 0000000..6b771b6 --- /dev/null +++ b/SOURCES/bz2154727-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch @@ -0,0 +1,24 @@ +From e7a748d35fe56f2be727ecae1885a2f1366f41bf Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 15 Mar 2023 13:03:07 +0100 +Subject: [PATCH] ethmonitor: dont log "Interface does not exist" for + monitor-action + +--- + heartbeat/ethmonitor | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/heartbeat/ethmonitor b/heartbeat/ethmonitor +index 451738a0b5..f9c9ef4bdd 100755 +--- a/heartbeat/ethmonitor ++++ b/heartbeat/ethmonitor +@@ -271,6 +271,9 @@ if_init() { + validate-all) + ocf_exit_reason "Interface $NIC does not exist" + exit $OCF_ERR_CONFIGURED;; ++ monitor) ++ ocf_log debug "Interface $NIC does not exist" ++ ;; + *) + ## It might be a bond interface which is temporarily not available, therefore we want to continue here + ocf_log warn "Interface $NIC does not exist" diff --git a/SOURCES/bz2182761-azure-events-1-fix-no-transition-summary.patch b/SOURCES/bz2181019-azure-events-1-fix-no-transition-summary.patch similarity index 100% rename from SOURCES/bz2182761-azure-events-1-fix-no-transition-summary.patch rename to SOURCES/bz2181019-azure-events-1-fix-no-transition-summary.patch diff --git a/SOURCES/bz2182761-azure-events-2-improve-logic.patch b/SOURCES/bz2181019-azure-events-2-improve-logic.patch similarity index 100% rename from SOURCES/bz2182761-azure-events-2-improve-logic.patch rename to SOURCES/bz2181019-azure-events-2-improve-logic.patch diff --git a/SOURCES/bz2183152-Filesystem-fail-efs-utils-not-installed.patch b/SOURCES/bz2183152-Filesystem-fail-efs-utils-not-installed.patch new file mode 100644 index 0000000..72da518 --- /dev/null +++ b/SOURCES/bz2183152-Filesystem-fail-efs-utils-not-installed.patch @@ -0,0 +1,23 @@ +From b02b06c437b1d8cb1dcfe8ace47c2efc4a0e476c Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 30 Mar 2023 14:44:41 +0200 +Subject: [PATCH] Filesystem: fail if AWS efs-utils not installed when + fstype=efs + +--- + heartbeat/Filesystem | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem +index 65088029ec..50c68f115b 100755 +--- a/heartbeat/Filesystem ++++ b/heartbeat/Filesystem +@@ -456,7 +456,7 @@ fstype_supported() + # System (EFS) + case "$FSTYPE" in + fuse.*|glusterfs|rozofs) support="fuse";; +- efs) support="nfs4";; ++ efs) check_binary "mount.efs"; support="nfs4";; + esac + + if [ "$support" != "$FSTYPE" ]; then diff --git a/SOURCES/bz2189243-Filesystem-1-improve-stop-action.patch b/SOURCES/bz2189243-Filesystem-1-improve-stop-action.patch new file mode 100644 index 0000000..351600b --- /dev/null +++ b/SOURCES/bz2189243-Filesystem-1-improve-stop-action.patch @@ -0,0 +1,125 @@ +From 48ed6e6d6510f42743e4463970e27f05637e4982 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 4 Jul 2023 14:40:19 +0200 +Subject: [PATCH] Filesystem: improve stop-action and allow setting term/kill + signals and signal_delay for large filesystems + +--- + heartbeat/Filesystem | 80 ++++++++++++++++++++++++++++++++++++++------ + 1 file changed, 70 insertions(+), 10 deletions(-) + +diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem +index 65a9dffb5..fe608ebfd 100755 +--- a/heartbeat/Filesystem ++++ b/heartbeat/Filesystem +@@ -71,6 +71,9 @@ OCF_RESKEY_run_fsck_default="auto" + OCF_RESKEY_fast_stop_default="no" + OCF_RESKEY_force_clones_default="false" + OCF_RESKEY_force_unmount_default="true" ++OCF_RESKEY_term_signals_default="TERM" ++OCF_RESKEY_kill_signals_default="KILL" ++OCF_RESKEY_signal_delay_default="1" + + # RHEL specific defaults + if is_redhat_based; then +@@ -104,6 +107,9 @@ if [ -z "${OCF_RESKEY_fast_stop}" ]; then + fi + : ${OCF_RESKEY_force_clones=${OCF_RESKEY_force_clones_default}} + : ${OCF_RESKEY_force_unmount=${OCF_RESKEY_force_unmount_default}} ++: ${OCF_RESKEY_term_signals=${OCF_RESKEY_term_signals_default}} ++: ${OCF_RESKEY_kill_signals=${OCF_RESKEY_kill_signals_default}} ++: ${OCF_RESKEY_signal_delay=${OCF_RESKEY_signal_delay_default}} + + # Variables used by multiple methods + HOSTOS=$(uname) +@@ -266,6 +272,30 @@ block if unresponsive nfs mounts are in use on the system. + + + ++ ++ ++Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action. ++ ++Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action ++ ++ ++ ++ ++ ++Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action. ++ ++Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action ++ ++ ++ ++ ++ ++How many seconds to wait after sending term/kill signals to processes in stop-action. ++ ++How many seconds to wait after sending term/kill signals to processes in stop-action ++ ++ ++ + + + +@@ -663,19 +693,49 @@ try_umount() { + } + return $OCF_ERR_GENERIC + } +-fs_stop() { +- local SUB="$1" timeout=$2 sig cnt +- for sig in TERM KILL; do +- cnt=$((timeout/2)) # try half time with TERM +- while [ $cnt -gt 0 ]; do +- try_umount "$SUB" && +- return $OCF_SUCCESS +- ocf_exit_reason "Couldn't unmount $SUB; trying cleanup with $sig" ++timeout_child() { ++ local pid="$1" timeout="$2" killer ret ++ ++ # start job in the background that will KILL the given process after timeout expires ++ sleep $timeout && kill -s KILL $pid & ++ killer=$! ++ ++ # block until the child process either exits on its own or gets killed by the above killer pipeline ++ wait $pid ++ ret=$? ++ ++ # ret would be 127 + child exit code if the timeout expired ++ [ $ret -lt 128 ] && kill -s KILL $killer ++ return $ret ++} ++fs_stop_loop() { ++ local SUB="$1" signals="$2" sig ++ while true; do ++ for sig in $signals; do + signal_processes "$SUB" $sig +- cnt=$((cnt-1)) +- sleep 1 + done ++ sleep $OCF_RESKEY_signal_delay ++ try_umount "$SUB" && return $OCF_SUCCESS + done ++} ++fs_stop() { ++ local SUB="$1" timeout=$2 grace_time ret ++ grace_time=$((timeout/2)) ++ ++ # try gracefully terminating processes for up to half of the configured timeout ++ fs_stop_loop "$SUB" "$OCF_RESKEY_term_signals" & ++ timeout_child $! $grace_time ++ ret=$? ++ [ $ret -eq $OCF_SUCCESS ] && return $ret ++ ++ # try killing them for the rest of the timeout ++ fs_stop_loop "$SUB" "$OCF_RESKEY_kill_signals" & ++ timeout_child $! $grace_time ++ ret=$? ++ [ $ret -eq $OCF_SUCCESS ] && return $ret ++ ++ # timeout expired ++ ocf_exit_reason "Couldn't unmount $SUB within given timeout" + return $OCF_ERR_GENERIC + } + diff --git a/SOURCES/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch b/SOURCES/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch new file mode 100644 index 0000000..9f61043 --- /dev/null +++ b/SOURCES/bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch @@ -0,0 +1,49 @@ +From 7056635f3f94c1bcaaa5ed5563dc3b0e9f6749e0 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Tue, 18 Jul 2023 14:12:27 +0200 +Subject: [PATCH] Filesystem: dont use boolean type for non-boolean parameters + +--- + heartbeat/Filesystem | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem +index ee55a4843..b9aae8d50 100755 +--- a/heartbeat/Filesystem ++++ b/heartbeat/Filesystem +@@ -269,7 +269,7 @@ fuser cli tool. fuser is known to perform operations that can potentially + block if unresponsive nfs mounts are in use on the system. + + Kill processes before unmount +- ++ + + + +@@ -277,7 +277,7 @@ block if unresponsive nfs mounts are in use on the system. + Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action. + + Signals (names or numbers, whitespace separated) to send processes during graceful termination phase in stop-action +- ++ + + + +@@ -285,7 +285,7 @@ Signals (names or numbers, whitespace separated) to send processes during gracef + Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action. + + Signals (names or numbers, whitespace separated) to send processes during forceful killing phase in stop-action +- ++ + + + +@@ -293,7 +293,7 @@ Signals (names or numbers, whitespace separated) to send processes during forcef + How many seconds to wait after sending term/kill signals to processes in stop-action. + + How many seconds to wait after sending term/kill signals to processes in stop-action +- ++ + + + diff --git a/SOURCES/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch b/SOURCES/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch new file mode 100644 index 0000000..5079b76 --- /dev/null +++ b/SOURCES/bz2189243-Filesystem-3-fix-signal_delay-default-value.patch @@ -0,0 +1,23 @@ +From f779fad52e5f515ca81218da6098398bdecac286 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Thu, 20 Jul 2023 10:18:12 +0200 +Subject: [PATCH] Filesystem: fix incorrect variable name for signal_delay + default in metadata + +--- + heartbeat/Filesystem | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem +index b9aae8d50..066562891 100755 +--- a/heartbeat/Filesystem ++++ b/heartbeat/Filesystem +@@ -293,7 +293,7 @@ Signals (names or numbers, whitespace separated) to send processes during forcef + How many seconds to wait after sending term/kill signals to processes in stop-action. + + How many seconds to wait after sending term/kill signals to processes in stop-action +- ++ + + + diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index 21fe56b..e68baae 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -69,7 +69,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.9.0 -Release: 40%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 +Release: 48%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ and LGPLv2+ URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -136,8 +136,19 @@ Patch44: bz2157873-2-Filesystem-CTDB-validate-all-improvements.patch Patch45: bz2157873-3-pgsqlms-validate-all-OCF_CHECK_LEVEL-10.patch Patch46: bz2157873-4-exportfs-pgsql-validate-all-fixes.patch Patch47: bz2157873-5-pgsqlms-alidate-all-OCF_CHECK_LEVEL-10.patch -Patch48: bz2182761-azure-events-1-fix-no-transition-summary.patch -Patch49: bz2182761-azure-events-2-improve-logic.patch +Patch48: bz2040110-IPaddr2-IPsrcaddr-1-support-policy-based-routing.patch +Patch49: bz2149970-lvmlockd-add-use_lvmlockd-if-missing.patch +Patch50: bz2154727-ethmonitor-dont-log-iface-doesnt-exist-monitor.patch +Patch51: bz2039692-mysql-1-replication-fixes.patch +Patch52: bz2181019-azure-events-1-fix-no-transition-summary.patch +Patch53: bz2181019-azure-events-2-improve-logic.patch +Patch54: bz2183152-Filesystem-fail-efs-utils-not-installed.patch +Patch55: bz2039692-mysql-2-fix-demoted-score-bounce.patch +Patch56: bz2040110-IPaddr2-IPsrcaddr-2-fix-table-parameter.patch +Patch57: bz2189243-Filesystem-1-improve-stop-action.patch +Patch58: bz2189243-Filesystem-2-fix-incorrect-parameter-types.patch +Patch59: bz2189243-Filesystem-3-fix-signal_delay-default-value.patch +Patch60: bz2040110-IPaddr2-IPsrcaddr-3-dont-use-table-parameter.patch # bundle patches Patch1000: 7-gcp-bundled.patch @@ -367,6 +378,17 @@ exit 1 %patch47 -p1 %patch48 -p1 %patch49 -p1 +%patch50 -p1 +%patch51 -p1 +%patch52 -p1 +%patch53 -p1 +%patch54 -p1 +%patch55 -p1 +%patch56 -p1 +%patch57 -p1 +%patch58 -p1 +%patch59 -p1 +%patch60 -p1 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -942,10 +964,35 @@ ccs_update_schema > /dev/null 2>&1 ||: %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog -* Tue May 2 2023 Oyvind Albrigtsen - 4.9.0-40.1 +* Thu Oct 5 2023 Oyvind Albrigtsen - 4.9.0-48 +- IPaddr2/IPsrcaddr: support policy-based routing + + Resolves: rhbz#2040110 + +* Thu Jul 20 2023 Oyvind Albrigtsen - 4.9.0-47 +- Filesystem: improve stop-action and allow setting term/kill signals + and signal_delay for large filesystems + + Resolves: rhbz#2189243 + +* Wed Jun 14 2023 Oyvind Albrigtsen - 4.9.0-43 +- mysql: fix replication issues + + Resolves: rhbz#2039692 + +* Mon May 1 2023 Oyvind Albrigtsen - 4.9.0-42 - azure-events*: fix for no "Transition Summary" for Pacemaker 2.1+ +- Filesystem: fail if AWS efs-utils not installed when fstype=efs + + Resolves: rhbz#2181019 + Resolves: rhbz#2183152 + +* Wed Mar 22 2023 Oyvind Albrigtsen - 4.9.0-41 +- lvmlockd: add "use_lvmlockd = 1" if it's commented out or missing +- ethmonitor: dont log "Interface does not exist" for monitor-action - Resolves: rhbz#2182761 + Resolves: rhbz#2149970 + Resolves: rhbz#2154727 * Tue Jan 17 2023 Oyvind Albrigtsen - 4.9.0-40 - all agents: dont check notify/promotable settings during