From 4f1eaf8853aad6055161afc43057835842e00149 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Feb 25 2022 05:27:16 +0000 Subject: import resource-agents-4.9.0-15.el8 --- diff --git a/SOURCES/bz2029706-1-db2-crm_attribute-use-forever.patch b/SOURCES/bz2029706-1-db2-crm_attribute-use-forever.patch new file mode 100644 index 0000000..17f26c8 --- /dev/null +++ b/SOURCES/bz2029706-1-db2-crm_attribute-use-forever.patch @@ -0,0 +1,32 @@ +From 925180da2f41feddc5aac3c249563eb179b34029 Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Mon, 22 Nov 2021 16:44:48 +0100 +Subject: [PATCH] db2: use -l forever instead of -t nodes -l reboot, as they + conflict with eachother + +--- + heartbeat/db2 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/heartbeat/db2 b/heartbeat/db2 +index 03146a957..fa2a45a5d 100755 +--- a/heartbeat/db2 ++++ b/heartbeat/db2 +@@ -274,7 +274,7 @@ db2_fal_attrib() { + while read id node member + do + [ "$member" = member -a "$node" != "$me" ] || continue +- crm_attribute -t nodes -l reboot --node=$node -n $attr -v "$3" ++ crm_attribute -l forever --node=$node -n $attr -v "$3" + rc=$? + ocf_log info "DB2 instance $instance($db2node/$db: setting attrib for FAL to $FIRST_ACTIVE_LOG @ $node" + [ $rc != 0 ] && break +@@ -282,7 +282,7 @@ db2_fal_attrib() { + ;; + + get) +- crm_attribute -t nodes -l reboot -n $attr -G --quiet 2>&1 ++ crm_attribute -l forever -n $attr -G --quiet 2>&1 + rc=$? + if [ $rc != 0 ] + then diff --git a/SOURCES/bz2029706-2-db2-fixes.patch b/SOURCES/bz2029706-2-db2-fixes.patch new file mode 100644 index 0000000..c9fe8c3 --- /dev/null +++ b/SOURCES/bz2029706-2-db2-fixes.patch @@ -0,0 +1,32 @@ +From 75eaf06eea8957aa3941823955d1c8fa7933ab1d Mon Sep 17 00:00:00 2001 +From: Oyvind Albrigtsen +Date: Wed, 23 Feb 2022 16:32:21 +0100 +Subject: [PATCH] db2: only warn when notify isnt set, and use + ocf_local_nodename() to get node name + +--- + heartbeat/db2 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/heartbeat/db2 b/heartbeat/db2 +index fa2a45a5d..ea24d33fc 100755 +--- a/heartbeat/db2 ++++ b/heartbeat/db2 +@@ -267,7 +267,7 @@ db2_fal_attrib() { + + case "$2" in + set) +- me=$(uname -n) ++ me=$(ocf_local_nodename) + + # loop over all member nodes and set attribute + crm_node -l | +@@ -284,7 +284,7 @@ db2_fal_attrib() { + get) + crm_attribute -l forever -n $attr -G --quiet 2>&1 + rc=$? +- if [ $rc != 0 ] ++ if ! ocf_is_true "$OCF_RESKEY_CRM_meta_notify" && [ $rc != 0 ] + then + ocf_log warn "DB2 instance $instance($db2node/$db: can't retrieve attribute $attr, are you sure notifications are enabled ?" + fi diff --git a/SOURCES/bz2029706-db2-crm_attribute-use-forever.patch b/SOURCES/bz2029706-db2-crm_attribute-use-forever.patch deleted file mode 100644 index 17f26c8..0000000 --- a/SOURCES/bz2029706-db2-crm_attribute-use-forever.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 925180da2f41feddc5aac3c249563eb179b34029 Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Mon, 22 Nov 2021 16:44:48 +0100 -Subject: [PATCH] db2: use -l forever instead of -t nodes -l reboot, as they - conflict with eachother - ---- - heartbeat/db2 | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/heartbeat/db2 b/heartbeat/db2 -index 03146a957..fa2a45a5d 100755 ---- a/heartbeat/db2 -+++ b/heartbeat/db2 -@@ -274,7 +274,7 @@ db2_fal_attrib() { - while read id node member - do - [ "$member" = member -a "$node" != "$me" ] || continue -- crm_attribute -t nodes -l reboot --node=$node -n $attr -v "$3" -+ crm_attribute -l forever --node=$node -n $attr -v "$3" - rc=$? - ocf_log info "DB2 instance $instance($db2node/$db: setting attrib for FAL to $FIRST_ACTIVE_LOG @ $node" - [ $rc != 0 ] && break -@@ -282,7 +282,7 @@ db2_fal_attrib() { - ;; - - get) -- crm_attribute -t nodes -l reboot -n $attr -G --quiet 2>&1 -+ crm_attribute -l forever -n $attr -G --quiet 2>&1 - rc=$? - if [ $rc != 0 ] - then diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index c907fef..dc41e80 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -66,7 +66,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.9.0 -Release: 14%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 15%{?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} @@ -94,9 +94,10 @@ Patch7: bz2015789-gcp-ilb-2-only-check-log_cmd-if-log-enabled.patch Patch8: bz2015789-gcp-ilb-3-use-bundled-gcloud.patch Patch9: bz2027591-nfsnotify-fix-notify_args-default.patch Patch10: bz2012057-Route-return-OCF_NOT_RUNNING-missing-route.patch -Patch11: bz2029706-db2-crm_attribute-use-forever.patch -Patch12: bz1992661-mysql-use-ssl-mode.patch -Patch13: bz1654862-IPsrcaddr-dhcp-warning.patch +Patch11: bz2029706-1-db2-crm_attribute-use-forever.patch +Patch12: bz2029706-2-db2-fixes.patch +Patch13: bz1992661-mysql-use-ssl-mode.patch +Patch14: bz1654862-IPsrcaddr-dhcp-warning.patch # bundle patches Patch1000: 7-gcp-bundled.patch @@ -284,6 +285,7 @@ exit 1 %patch11 -p1 %patch12 -p1 %patch13 -p1 +%patch14 -p1 chmod 755 heartbeat/nova-compute-wait chmod 755 heartbeat/NovaEvacuate @@ -864,6 +866,11 @@ ccs_update_schema > /dev/null 2>&1 ||: %{_usr}/lib/ocf/lib/heartbeat/OCF_*.pm %changelog +* Thu Feb 24 2022 Oyvind Albrigtsen - 4.9.0-15 +- db2: use -l forever to fix crm_attribute issue + + Resolves: rhbz#2029706 + * Tue Feb 15 2022 Oyvind Albrigtsen - 4.9.0-14 - IPsrcaddr: add warning about possible issues when used with DHCP @@ -877,10 +884,8 @@ ccs_update_schema > /dev/null 2>&1 ||: * Tue Dec 7 2021 Oyvind Albrigtsen - 4.9.0-12 - Route: return OCF_NOT_RUNNING for probe action when interface or route doesnt exist -- db2: use -l forever to fix crm_attribute issue Resolves: rhbz#2012057 - Resolves: rhbz#2029706 * Tue Nov 30 2021 Oyvind Albrigtsen - 4.9.0-11 - nfsnotify: fix default value for "notify_args"