From e5d32e1d564fcc651a5fb650908c27f41f6430a5 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 21 Dec 2021 04:13:30 -0500 Subject: [PATCH] import resource-agents-sap-hana-0.154.0-3.el8_5.1 --- ...a-remove-HANA_CALL_TIMEOUT-parameter.patch | 30 +++++++++++++++++++ ...y-remove-HANA_CALL_TIMEOUT-parameter.patch | 30 +++++++++++++++++++ SPECS/resource-agents-sap-hana.spec | 12 +++++++- 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 SOURCES/bz2027456-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch create mode 100644 SOURCES/bz2027456-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch diff --git a/SOURCES/bz2027456-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch b/SOURCES/bz2027456-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch new file mode 100644 index 0000000..80a8cbb --- /dev/null +++ b/SOURCES/bz2027456-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch @@ -0,0 +1,30 @@ +From 621c6cc4ca494834f921671a4540b7063a33648e Mon Sep 17 00:00:00 2001 +From: Frank Danapfel +Date: Fri, 12 Nov 2021 11:35:15 +0100 +Subject: [PATCH] SAPHana: remove info about HANA_CALL_TIMEOUT parameter + +It doesn't make sense to have HANA_CALL_TIMEOUT listed as a parameter since it is hardcoded to 60s and therefore can't be changed. +--- + heartbeat/SAPHana | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/heartbeat/SAPHana b/heartbeat/SAPHana +index cd91ddf..5da587d 100755 +--- a/heartbeat/SAPHana ++++ b/heartbeat/SAPHana +@@ -242,15 +242,6 @@ The resource agent uses the following four interfaces provided by SAP: + + + +- +- Define timeout how long a call to HANA to receive information can take. +- Define timeout how long a call to HANA to receive information can take. This could be eg landscapeHostConfiguration.py. +- There are some specific calls to HANA which have their own timeout values. For example the takeover command does not timeout (inf). +- If the timeout is reached, the return code will be 124. If you increase the timeouts for HANA calls you should also adjust the operation timeouts +- of your cluster resources. +- +- +- + + The full qualified path where to find sapstartsrv and sapcontrol. Specify this parameter, if you have changed the SAP kernel directory location after the default SAP installation. + Path of sapstartsrv and sapcontrol diff --git a/SOURCES/bz2027456-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch b/SOURCES/bz2027456-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch new file mode 100644 index 0000000..e8da0c9 --- /dev/null +++ b/SOURCES/bz2027456-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch @@ -0,0 +1,30 @@ +From 91a6a7fca636972a9604675a99946e8a8e51fd73 Mon Sep 17 00:00:00 2001 +From: Frank Danapfel +Date: Fri, 12 Nov 2021 11:36:33 +0100 +Subject: [PATCH] SAPHanaTopology: Remove info about HANA_CALL_TIMEOUT + +It doesn't make sense to have HANA_CALL_TIMEOUT listed as a parameter since it is hardcoded to 60s and therefore can't be changed. +--- + heartbeat/SAPHanaTopology | 9 --------- + 1 file changed, 9 deletions(-) + +diff --git a/heartbeat/SAPHanaTopology b/heartbeat/SAPHanaTopology +index afc645c..29819d7 100755 +--- a/heartbeat/SAPHanaTopology ++++ b/heartbeat/SAPHanaTopology +@@ -173,15 +173,6 @@ SAPHanaTopology scans the output table of landscapeHostConfiguration.py to ident + The SAP Instance Number + + +- +- Define timeout how long a call to HANA to receive information can take. +- Define timeout how long a call to HANA to receive information can take. This could be eg landscapeHostConfiguration.py. +- There are some specific calls to HANA which have their own timeout values. For example the takeover command does not timeout (inf). +- If the timeout is reached, the return code will be 124. If you increase the timeouts for HANA calls you should also adjust the operation timeouts +- of your cluster resources. +- +- +- + + Path to the SAP Hana Instance executable directory. If not set the RA tries /usr/sap/\$SID/\$InstanceName/exe. + While InstanceName is the string of "HDB" and \$InstanceNumber for SAP Hana databases. diff --git a/SPECS/resource-agents-sap-hana.spec b/SPECS/resource-agents-sap-hana.spec index fcf7b8c..bab3a89 100644 --- a/SPECS/resource-agents-sap-hana.spec +++ b/SPECS/resource-agents-sap-hana.spec @@ -29,7 +29,7 @@ Name: resource-agents-sap-hana Summary: SAP HANA cluster resource agents Epoch: 1 Version: 0.154.0 -Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 License: GPLv2+ URL: https://github.com/SUSE/SAPHanaSR %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -40,6 +40,8 @@ Group: Productivity/Clustering/HA Source0: %{upstream_prefix}-%{upstream_version}.tar.gz Source1: %{saphana_prefix}-%{saphana_version}.tar.gz Patch0: bz1855885-SAPHana-use-actual-mode.patch +Patch1: bz2027456-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch +Patch2: bz2027456-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch BuildArch: noarch @@ -74,6 +76,8 @@ sed -i -e '/ ocf_heartbeat_SAPInstance.7 \\/a\ sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build if [ ! -f configure ]; then @@ -130,6 +134,12 @@ rm -rf %{buildroot} %exclude /usr/src %changelog +* Tue Nov 30 2021 Oyvind Albrigtsen - 0.154.0-3.1 +- SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from + metadata + + Resolves: rhbz#2027456 + * Thu Jul 22 2021 Oyvind Albrigtsen - 0.154.0-3 - SAPHana: use actual_mode from global.ini and fallback to mode when it's not set