From ba30ef99396c8381155663ec876b09a43fbf74f9 Mon Sep 17 00:00:00 2001 From: Janine Fuchs Date: Thu, 1 Feb 2024 13:51:03 +0100 Subject: [PATCH] - Rebase to SAPHanaSR 0.162.3 upstream release and include the ChkSrv.py hook script to handle hanging HDBindexserver services Resolves: RHEL-22305 --- resource-agents-sap-hana.spec | 24 +++++++++++++++++++----- sources | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/resource-agents-sap-hana.spec b/resource-agents-sap-hana.spec index ef0e20c..ccf9454 100644 --- a/resource-agents-sap-hana.spec +++ b/resource-agents-sap-hana.spec @@ -23,7 +23,7 @@ %global upstream_version e76b7d3a %global saphana_prefix SAPHanaSR -%global saphana_version 6281418 +%global saphana_version 2484fa7 # Whether this platform defaults to using systemd as an init system # (needs to be evaluated prior to BuildRequires being enumerated and @@ -48,8 +48,8 @@ Name: resource-agents-sap-hana Summary: SAP HANA cluster resource agents Epoch: 1 -Version: 0.162.1 -Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} +Version: 0.162.3 +Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} License: GPLv2+ URL: https://github.com/SUSE/SAPHanaSR Source0: %{upstream_prefix}-%{upstream_version}.tar.gz @@ -103,10 +103,17 @@ mv %{saphana_prefix}-%{saphana_version}/ra/SAPHana* heartbeat sed -i -e '/ SAPInstance \\/a\ SAPHana \\\n SAPHanaTopology \\' heartbeat/Makefile.am sed -i -e '/ ocf_heartbeat_SAPInstance.7 \\/a\ ocf_heartbeat_SAPHana.7 \\\n ocf_heartbeat_SAPHanaTopology.7 \\' doc/man/Makefile.am -# change provider company +# change provider company in hook scripts sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_version}/srHook/SAPHanaSR.py +sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py -#%patch0 -p1 +# rename patterns to remove "sus" prefix in hook script +sed -i -e 's/susChkSrv/ChkSrv/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py +sed -i -e 's/suschksrv/chksrv/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py +sed -i -e 's/sustkover_timeout/tkover_timeout/g' %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py + +# add patches +# %patch0 -p1 %build if [ ! -f configure ]; then @@ -167,6 +174,7 @@ find %{buildroot}/%{_mandir} -type f ! -iname "*SAPHana*" -exec rm {} \; 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 +cp -r %{saphana_prefix}-%{saphana_version}/srHook/susChkSrv.py %{buildroot}/%{_datadir}/SAPHanaSR/srHook/ChkSrv.py ## tree fixup # remove docs (there is only one and they should come from doc sections in files) @@ -191,6 +199,12 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents %exclude /usr/src %changelog +* Wed Jan 31 2024 Janine Fuchs - 0.162.3-1 +- Rebase to SAPHanaSR 0.162.3 upstream release and include the + ChkSrv.py hook script to handle hanging HDBindexserver services + + Resolves: RHEL-22305 + * Thu Mar 23 2023 Janine Fuchs - 0.162.1-2 - Rebase to SAPHanaSR 0.162.1 upstream release. diff --git a/sources b/sources index 1406706..66c04fc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ClusterLabs-resource-agents-e76b7d3a.tar.gz) = 218ab0dee7f07c2ae5646a0ea3231c33bd573de4f1b041ebed560074c256b21cf33836fe50f3a18eb1ec11c2f9a4515da1066d2e4932f59cea5b9b8af892a6a6 -SHA512 (SAPHanaSR-6281418.tar.gz) = 511338c205496fe73700eba1799bf12136584d284def063c29c81961233034ba5b6dd864e2cced56699a496346057cd4ea9ce5194885ab8b5710f1c3ad50b40f +SHA512 (SAPHanaSR-2484fa7.tar.gz) = 73f09d1f3bc2a0dd0ae2ebb294b4497e5c951e122febb748a80d9b14203336dadc520e42a8c30101a5b50553a1eac5e82b040be7d0c13c7223994623bdcfa01d