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

import CS resource-agents-sap-hana-0.162.3-2.el9

This commit is contained in:
eabdullin 2024-03-28 11:40:08 +00:00
parent dbf0b9b0f9
commit ac1dd7c475
6 changed files with 29 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz
SOURCES/SAPHanaSR-2dea8fe.tar.gz
SOURCES/SAPHanaSR-e8188e0.tar.gz

2
.resource-agents-sap-hana.metadata
View File

@ -1,2 +1,2 @@
b1c1e65d690d94e080319217486f8dcd248b2a2a SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz
e5ae03dcac77cbb2f5ec85d3785f048c0de0acc0 SOURCES/SAPHanaSR-2dea8fe.tar.gz
95ea542f8759e90d5fd0ca512bea679d83316979 SOURCES/SAPHanaSR-e8188e0.tar.gz

30
SOURCES/bz2027423-1-SAPHana-remove-HANA_CALL_TIMEOUT-parameter.patch
View File

@ -1,30 +0,0 @@
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>

30
SOURCES/bz2027423-2-SAPHanaTopology-remove-HANA_CALL_TIMEOUT-parameter.patch
View File

@ -1,30 +0,0 @@
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.

41
SOURCES/bz2027423-3-SAPHana-SAPHanaTopology-fix-metadata-version.patch
View File

@ -1,41 +0,0 @@
From 182dbd793e9c6ce0e5a0abc7d595a864175248bb Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
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 <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SAPHana">
-<version>$SAPHanaVersion</version>
+<resource-agent name="SAPHana" version="$SAPHanaVersion">
+<version>1.0</version>
<shortdesc lang="en">Manages two SAP HANA database systems in system replication (SR).</shortdesc>
<longdesc lang="en">
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 <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SAPHanaTopology">
- <version>$SAPHanaTopologyVersion</version>
+<resource-agent name="SAPHanaTopology" version="$SAPHanaTopologyVersion">
+ <version>1.0</version>
<shortdesc lang="en">Analyzes SAP HANA System Replication Topology.</shortdesc>
<longdesc lang="en">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.

39
SPECS/resource-agents-sap-hana.spec
View File

@ -23,7 +23,7 @@
%global upstream_version e76b7d3a
%global saphana_prefix SAPHanaSR
%global saphana_version 2dea8fe
%global saphana_version e8188e0
# 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.3
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
@ -106,12 +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
%patch1 -p1
%patch2 -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
@ -169,8 +171,10 @@ 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
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)
@ -195,6 +199,17 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%exclude /usr/src
%changelog
* Fri Feb 2 2024 Janine Fuchs <jfuchs@redhat.com> - 0.162.3-2
- 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 <jfuchs@redhat.com> - 0.162.1-2
- Rebase to SAPHanaSR 0.162.1 upstream release.
Resolves: rhbz#2165700
* Thu Jan 20 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.155.0-4
- SAPHana/SAPHanaTopology: remove HANA_CALL_TIMEOUT parameter from
metadata