rpms/resource-agents
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import resource-agents-4.9.0-15.el8

Browse Source
This commit is contained in:
CentOS Sources 2022-02-25 05:27:16 +00:00 committed by Stepan Oksanichenko
parent 7d373a8088
commit 67f10d889f
3 changed files with 43 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
SOURCES/bz2029706-db2-crm_attribute-use-forever.patch → SOURCES/bz2029706-1-db2-crm_attribute-use-forever.patch
View File

32
SOURCES/bz2029706-2-db2-fixes.patch Normal file
View File

@ -0,0 +1,32 @@
From 75eaf06eea8957aa3941823955d1c8fa7933ab1d Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
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

17
SPECS/resource-agents.spec
View File

@ -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 <oalbrigt@redhat.com> - 4.9.0-15
- db2: use -l forever to fix crm_attribute issue
Resolves: rhbz#2029706
* Tue Feb 15 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 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 <oalbrigt@redhat.com> - 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 <oalbrigt@redhat.com> - 4.9.0-11
- nfsnotify: fix default value for "notify_args"