diff --git a/.gitignore b/.gitignore index 4348591..6d80146 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz -SOURCES/SAPHanaSR-2dea8fe.tar.gz +SOURCES/SAPHanaSR-6281418.tar.gz diff --git a/.resource-agents-sap-hana.metadata b/.resource-agents-sap-hana.metadata index 51f14c0..7abfb48 100644 --- a/.resource-agents-sap-hana.metadata +++ b/.resource-agents-sap-hana.metadata @@ -1,2 +1,2 @@ b1c1e65d690d94e080319217486f8dcd248b2a2a SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz -e5ae03dcac77cbb2f5ec85d3785f048c0de0acc0 SOURCES/SAPHanaSR-2dea8fe.tar.gz +8d25b08bed4b158d83a2884588a345374efdb500 SOURCES/SAPHanaSR-6281418.tar.gz diff --git a/SOURCES/bz2027423-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch b/SOURCES/bz2027423-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch deleted file mode 100644 index 80a8cbb..0000000 --- a/SOURCES/bz2027423-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/bz2027423-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch b/SOURCES/bz2027423-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch deleted file mode 100644 index e8da0c9..0000000 --- a/SOURCES/bz2027423-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch +++ /dev/null @@ -1,30 +0,0 @@ -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/SOURCES/bz2027423-3-SAPHana-SAPHanaTopology-fix-metadata-version.patch b/SOURCES/bz2027423-3-SAPHana-SAPHanaTopology-fix-metadata-version.patch deleted file mode 100644 index f09a53e..0000000 --- a/SOURCES/bz2027423-3-SAPHana-SAPHanaTopology-fix-metadata-version.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 182dbd793e9c6ce0e5a0abc7d595a864175248bb Mon Sep 17 00:00:00 2001 -From: Oyvind Albrigtsen -Date: Thu, 20 Jan 2022 10:41:51 +0100 -Subject: [PATCH] SAPHana*: follow OCF standard for version and OCF version in - metadata - ---- - heartbeat/SAPHana | 4 ++-- - heartbeat/SAPHanaTopology | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/heartbeat/SAPHana b/heartbeat/SAPHana -index 295eff0..6527362 100755 ---- a/heartbeat/SAPHana -+++ b/heartbeat/SAPHana -@@ -160,8 +160,8 @@ function saphana_meta_data() { - cat < - -- --$SAPHanaVersion -+ -+1.0 - - Manages two SAP HANA database systems in system replication (SR). - -diff --git a/heartbeat/SAPHanaTopology b/heartbeat/SAPHanaTopology -index 3fce400..9ad2101 100755 ---- a/heartbeat/SAPHanaTopology -+++ b/heartbeat/SAPHanaTopology -@@ -134,8 +134,8 @@ function sht_meta_data() { - cat < - -- -- $SAPHanaTopologyVersion -+ -+ 1.0 - Analyzes SAP HANA System Replication Topology. - This RA analyzes the SAP HANA topology and "sends" all findings via the node status attributes to - all nodes in the cluster. These attributes are taken by the SAPHana RA to control the SAP Hana Databases. diff --git a/SPECS/resource-agents-sap-hana.spec b/SPECS/resource-agents-sap-hana.spec index 412d93d..ef0e20c 100644 --- a/SPECS/resource-agents-sap-hana.spec +++ b/SPECS/resource-agents-sap-hana.spec @@ -23,7 +23,7 @@ %global upstream_version e76b7d3a %global saphana_prefix SAPHanaSR -%global saphana_version 2dea8fe +%global saphana_version 6281418 # Whether this platform defaults to using systemd as an init system # (needs to be evaluated prior to BuildRequires being enumerated and @@ -48,15 +48,12 @@ Name: resource-agents-sap-hana Summary: SAP HANA cluster resource agents Epoch: 1 -Version: 0.155.0 -Release: 4%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 0.162.1 +Release: 2%{?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 -Patch2: bz2027423-3-SAPHana-SAPHanaTopology-fix-metadata-version.patch BuildArch: noarch @@ -109,9 +106,7 @@ 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 -%patch2 -p1 +#%patch0 -p1 %build if [ ! -f configure ]; then @@ -169,8 +164,9 @@ make install DESTDIR=%{buildroot} find %{buildroot}/usr/lib/ocf ! -type d ! -iname "SAPHana*" -exec rm {} \; find %{buildroot}/%{_mandir} -type f ! -iname "*SAPHana*" -exec rm {} \; -mkdir %{buildroot}/%{_datadir}/SAPHanaSR -cp -r %{saphana_prefix}-%{saphana_version}/srHook %{buildroot}/%{_datadir}/SAPHanaSR +mkdir -p %{buildroot}/%{_datadir}/SAPHanaSR/srHook +cp -r %{saphana_prefix}-%{saphana_version}/srHook/global.ini %{buildroot}/%{_datadir}/SAPHanaSR/srHook +cp -r %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py %{buildroot}/%{_datadir}/SAPHanaSR/srHook ## tree fixup # remove docs (there is only one and they should come from doc sections in files) @@ -195,6 +191,11 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %exclude /usr/src %changelog +* Thu Mar 23 2023 Janine Fuchs - 0.162.1-2 +- Rebase to SAPHanaSR 0.162.1 upstream release. + + Resolves: rhbz#2165700 + * Thu Jan 20 2022 Oyvind Albrigtsen - 0.155.0-4 - SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from metadata