import resource-agents-sap-hana-0.155.0-3.el9

SOURCES/bz2027423-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch

@@ -0,0 +1,30 @@
+From 621c6cc4ca494834f921671a4540b7063a33648e Mon Sep 17 00:00:00 2001
+From: Frank Danapfel <frank.danapfel@redhat.com>
+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:
+         </longdesc>
+         <content type="string" default="7200" />
+     </parameter>
+-    <parameter name="HANA_CALL_TIMEOUT" unique="0" required="0">
+-        <shortdesc lang="en">Define timeout how long a call to HANA to receive information can take.</shortdesc>
+-        <longdesc lang="en">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.
+-        </longdesc>
+-        <content type="string" default="60" />
+-    </parameter>
+     <parameter name="DIR_EXECUTABLE" unique="0" required="0">
+         <longdesc lang="en">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.</longdesc>
+         <shortdesc lang="en">Path of sapstartsrv and sapcontrol</shortdesc>

SOURCES/bz2027423-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch

@@ -0,0 +1,30 @@
+From 91a6a7fca636972a9604675a99946e8a8e51fd73 Mon Sep 17 00:00:00 2001
+From: Frank Danapfel <frank.danapfel@redhat.com>
+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
+         <shortdesc lang="en">The SAP Instance Number</shortdesc>
+         <content type="string" default="" />
+     </parameter>
+-    <parameter name="HANA_CALL_TIMEOUT" unique="0" required="0">
+-        <shortdesc lang="en">Define timeout how long a call to HANA to receive information can take.</shortdesc>
+-        <longdesc lang="en">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.
+-        </longdesc>
+-        <content type="string" default="60" />
+-    </parameter>
+     <parameter name="DIR_EXECUTABLE" unique="0" required="0">
+         <longdesc lang="en">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.

SPECS/resource-agents-sap-hana.spec

@@ -49,11 +49,13 @@ Name:		resource-agents-sap-hana
 Summary:	SAP HANA cluster resource agents
 Epoch:		1
 Version:	0.155.0
-Release:	2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
+Release:	3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
 License:	GPLv2+
 URL:		https://github.com/SUSE/SAPHanaSR
 Source0:	%{upstream_prefix}-%{upstream_version}.tar.gz
 Source1:	%{saphana_prefix}-%{saphana_version}.tar.gz
+Patch0:		bz2027423-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch
+Patch1:		bz2027423-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch
 
 BuildArch:	noarch
 
@@ -106,6 +108,9 @@ sed -i -e '/                          ocf_heartbeat_SAPInstance.7 \\/a\
 # change provider company
 sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py
 
+%patch0 -p1
+%patch1 -p1
+
 %build
 if [ ! -f configure ]; then
 	./autogen.sh
@@ -188,6 +193,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
 %exclude /usr/src
 
 %changelog
+* Tue Nov 30 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-3
+- SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from
+  metadata
+
+  Resolves: rhbz#2027423
+
 * Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.155.0-2.1
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688