rpms
/
resource-agents-sap-hana-scaleout
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: rpms:c9
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i9c
rpms:c9
...
pull from: rpms:cs10
Branches Tags
rpms:i10cs
rpms:cs10
rpms:i9c
rpms:c9

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

4 changed files with 92 additions and 114 deletions
Show Stats

4
.gitignore vendored
Unescape View File

@ -1,2 +1,2 @@
SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz SOURCES/ClusterLabs-resource-agents-204f1461.tar.gz
SOURCES/SAPHanaSR-ScaleOut-b2c5218.tar.gz SOURCES/SAPHanaSR-ScaleOut-f716fd8.tar.gz

4
.resource-agents-sap-hana-scaleout.metadata
Unescape View File

@ -1,2 +1,2 @@
b1c1e65d690d94e080319217486f8dcd248b2a2a SOURCES/ClusterLabs-resource-agents-e76b7d3a.tar.gz 3124f2b6488612b441323f570b64a40cd673b5ea SOURCES/ClusterLabs-resource-agents-204f1461.tar.gz
874bcb0898d1f8a99b2972c8f49a42c0fe7c0389 SOURCES/SAPHanaSR-ScaleOut-b2c5218.tar.gz e85c6e55cb01e60b67b510d5db4014cb70e6c1c7 SOURCES/SAPHanaSR-ScaleOut-f716fd8.tar.gz

41
SOURCES/bz2042921-SAPHanaController-SAPHanaTopology-fix-metadata-version.patch
Unescape View File

@ -1,41 +0,0 @@
From 5206e517e190b3c8dfc4b075cb31b5070e9670d4 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 20 Jan 2022 10:54:54 +0100
Subject: [PATCH] SAPHana*: follow OCF standard for version and OCF version in
metadata
---
heartbeat/SAPHanaController | 4 ++--
heartbeat/SAPHanaTopology | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/heartbeat/SAPHanaController b/heartbeat/SAPHanaController
index 767af44..c365f4a 100755
--- a/heartbeat/SAPHanaController
+++ b/heartbeat/SAPHanaController
@@ -166,8 +166,8 @@ function saphana_meta_data() {
cat <<END
<?xml version="1.0"?>
<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="SAPHanaController">
-<version>$SAPHanaControllerVersion</version>
+<resource-agent name="SAPHanaController" version="$SAPHanaControllerVersion">
+<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 05014af..7f6f4d9 100755
--- a/heartbeat/SAPHanaTopology
+++ b/heartbeat/SAPHanaTopology
@@ -132,8 +132,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.

147
SPECS/resource-agents-sap-hana-scaleout.spec
Unescape View File

@ -20,10 +20,10 @@
# #
%global upstream_prefix ClusterLabs-resource-agents %global upstream_prefix ClusterLabs-resource-agents
%global upstream_version e76b7d3a %global upstream_version 204f1461
%global saphana_scaleout_prefix SAPHanaSR-ScaleOut %global saphana_prefix SAPHanaSR-ScaleOut
%global saphana_scaleout_hash b2c5218 %global saphana_hash f716fd8
# Whether this platform defaults to using systemd as an init system # Whether this platform defaults to using systemd as an init system
# (needs to be evaluated prior to BuildRequires being enumerated and # (needs to be evaluated prior to BuildRequires being enumerated and
@ -41,28 +41,27 @@
} || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \ } || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \
} || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?)) } || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?))
# determine the ras-set to process based on configure invokation # determine the ras-set to process based on configure invocation
%bcond_with rgmanager %bcond_with rgmanager
%bcond_without linuxha %bcond_without linuxha
Name: resource-agents-sap-hana-scaleout Name: resource-agents-sap-hana-scaleout
Summary: SAP HANA Scale-Out cluster resource agents Summary: SAP HANA Scale-Out cluster resource agents
Epoch: 1 Epoch: 1
Version: 0.164.2 Version: 0.185.3
Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist} Release: 0%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1
License: GPLv2+ License: GPLv2+
URL: https://github.com/SUSE/SAPHanaSR-ScaleOut URL: https://github.com/SUSE/SAPHanaSR-ScaleOut
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
Source1: %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}.tar.gz Source1: %{saphana_prefix}-%{saphana_hash}.tar.gz
Patch0: bz2042921-SAPHanaController-SAPHanaTopology-fix-metadata-version.patch
BuildArch: noarch BuildArch: noarch
# Build dependencies # Build dependencies
BuildRequires: make BuildRequires: make
BuildRequires: automake autoconf pkgconfig gcc BuildRequires: automake autoconf pkgconfig gcc
BuildRequires: perl-interpreter BuildRequires: perl-interpreter perl-generators
BuildRequires: libxslt glib2-devel BuildRequires: libxslt glib2-devel libqb-devel
BuildRequires: systemd BuildRequires: systemd
BuildRequires: which BuildRequires: which
@ -89,7 +88,7 @@ Requires: resource-agents >= 4.8.0
Conflicts: resource-agents-sap-hana Conflicts: resource-agents-sap-hana
Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk Requires: /bin/bash /usr/bin/grep /bin/sed /bin/gawk
Requires: perl Requires: perl-interpreter
%description %description
The SAP HANA Scale-Out resource agents interface with Pacemaker The SAP HANA Scale-Out resource agents interface with Pacemaker
@ -101,13 +100,36 @@ environment.
%setup -q -T -D -a 1 -n %{upstream_prefix}-%{upstream_version} %setup -q -T -D -a 1 -n %{upstream_prefix}-%{upstream_version}
# add SAPHana agents to Makefile.am # add SAPHana agents to Makefile.am
mv %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/ra/SAPHana* heartbeat mv %{saphana_prefix}-%{saphana_hash}/SAPHana/ra/SAPHana* heartbeat
sed -i -e '/ SAPInstance \\/a\ SAPHanaController \\\n SAPHanaTopology \\' heartbeat/Makefile.am
sed -i -e '/ ocf_heartbeat_SAPInstance.7 \\/a\ ocf_heartbeat_SAPHanaController.7 \\\n ocf_heartbeat_SAPHanaTopology.7 \\' doc/man/Makefile.am
cp %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/doc/LICENSE . # Find the existing SAPInstance entry in the list and add 2 new after in corresponding formatting.
# heartbeat/Makefile.am indents by 3 tabs in the target list
sed -i -e 's/\(\t\tSAPInstance\t\t\\\)/\1\n\t\t\tSAPHanaController\t\t\t\\\n\t\t\tSAPHanaTopology\t\\/' heartbeat/Makefile.am
%patch0 -p1 # Find the existing SAPInstance entry in the list and add 2 new after in corresponding formatting.
# doc/man/Makefile.am indents by 26 spaces in the target list
sed -i -e 's/\( \{26\}ocf_heartbeat_SAPInstance.7 \\\)/\1\n'\
' ocf_heartbeat_SAPHanaController.7 \\\n'\
' ocf_heartbeat_SAPHanaTopology.7 \\/' doc/man/Makefile.am
# change provider company in hook scripts
sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/SAPHanaSR.py
sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/SAPHanaSrMultiTarget.py
sed -i -e 's/\("provider_company": \)"SUSE"/\1"Red Hat"/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/susChkSrv.py
# rename patterns explicitly to remove "sus" prefix in files
sed -i -e 's/susChkSrv/ChkSrv/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/susChkSrv.py
sed -i -e 's/suschksrv/chksrv/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/susChkSrv.py
sed -i -e 's/sustkover_timeout/tkover_timeout/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/susChkSrv.py
sed -i -e 's/susChkSrv/ChkSrv/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/global.ini_ChkSrv
sed -i -e 's/suschksrv/chksrv/g' %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/global.ini_ChkSrv
# copy the license
cp %{saphana_prefix}-%{saphana_hash}/SAPHana/doc/LICENSE .
# add patches
# %%patch0 -p1
%build %build
if [ ! -f configure ]; then if [ ! -f configure ]; then
@ -149,32 +171,47 @@ export CFLAGS
--with-pkg-name=resource-agents \ --with-pkg-name=resource-agents \
--with-ras-set=%{rasset} --with-ras-set=%{rasset}
%if %{defined jobs} make %{_smp_mflags}
JFLAGS="$(echo '-j%{jobs}')"
%else
JFLAGS="$(echo '%{_smp_mflags}')"
%endif
make $JFLAGS
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot}
# remove other agents # Remove other agents
find %{buildroot}/usr/lib/ocf ! -type d ! -iname "SAPHana*" -exec rm {} \; find %{buildroot}/usr/lib/ocf ! -type d ! -iname "SAPHana*" -exec rm {} \;
find %{buildroot}/%{_mandir} -type f ! -iname "*SAPHana*" -exec rm {} \; find %{buildroot}/%{_mandir} -type f ! -iname "*SAPHana*" -exec rm {} \;
install -m 0755 %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/bin/{SAPHanaSR-monitor,SAPHanaSR-showAttr} %{buildroot}/%{_sbindir} # Dir structure
mkdir %{buildroot}/%{_usr}/lib/SAPHanaSR-ScaleOut mkdir -p %{buildroot}/%{_datadir}/%{saphana_prefix}/samples
install -m 0444 %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/test/SAPHanaSRTools.pm %{buildroot}/%{_usr}/lib/SAPHanaSR-ScaleOut/SAPHanaSRTools.pm mkdir -p %{buildroot}/%{_sbindir}
mkdir -p %{buildroot}/%{_datadir}/SAPHanaSR-ScaleOut/samples mkdir -p %{buildroot}/%{_usr}/lib/%{saphana_prefix}
install -m 0644 %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/srHook/SAPHanaSR.py %{buildroot}/%{_datadir}/SAPHanaSR-ScaleOut
install -m 0444 %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/crmconfig/* %{buildroot}/%{_datadir}/SAPHanaSR-ScaleOut/samples
install -m 0444 %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/srHook/global.ini %{buildroot}/%{_datadir}/SAPHanaSR-ScaleOut/samples # Perl scripts for some add-on functionality.
gzip %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/man/SAPHanaSR*.? # SAPHanaSRTools is a lib imported by SAPHanaSR-* perl scripts.
cp %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/man/SAPHanaSR*.7.gz %{buildroot}/%{_mandir}/man7 install -m 0444 %{saphana_prefix}-%{saphana_hash}/SAPHana/test/SAPHanaSRTools.pm \
cp %{saphana_scaleout_prefix}-%{saphana_scaleout_hash}/SAPHana/man/SAPHanaSR*.8.gz %{buildroot}/%{_mandir}/man8 %{buildroot}/%{_usr}/lib/%{saphana_prefix}/SAPHanaSRTools.pm
install -m 0555 %{saphana_prefix}-%{saphana_hash}/SAPHana/bin/SAPHanaSR-showAttr \
%{buildroot}/%{_sbindir}
# Hook scripts - sanitize upstream names where needed
install -m 0644 %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/SAPHanaSR.py \
%{buildroot}/%{_datadir}/%{saphana_prefix}
install -m 0644 %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/SAPHanaSrMultiTarget.py \
%{buildroot}/%{_datadir}/%{saphana_prefix}
install -m 0644 %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/susChkSrv.py \
%{buildroot}/%{_datadir}/%{saphana_prefix}/ChkSrv.py
# Sample config files
install -m 0444 %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/global.ini \
%{buildroot}/%{_datadir}/%{saphana_prefix}/samples
install -m 0444 %{saphana_prefix}-%{saphana_hash}/SAPHana/srHook/global.ini_ChkSrv \
%{buildroot}/%{_datadir}/%{saphana_prefix}/samples
## Placeholder for man pages. We do not anymore include the inaccurate upstream pages.
# gzip %{saphana_prefix}-%{saphana_hash}/SAPHana/man/SAPHanaSR*.?
# cp %{saphana_prefix}-%{saphana_hash}/SAPHana/man/SAPHanaSR*.7.gz %{buildroot}/%{_mandir}/man7
# cp %{saphana_prefix}-%{saphana_hash}/SAPHana/man/SAPHanaSR*.8.gz %{buildroot}/%{_mandir}/man8
## tree fixup ## tree fixup
# remove docs (there is only one and they should come from doc sections in files) # remove docs (there is only one and they should come from doc sections in files)
@ -185,10 +222,10 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%license LICENSE %license LICENSE
%{_usr}/lib/ocf/resource.d/heartbeat/SAPHana* %{_usr}/lib/ocf/resource.d/heartbeat/SAPHana*
%{_mandir}/man7/*SAPHana* %{_mandir}/man7/*SAPHana*
%{_mandir}/man8/*SAPHana* # %%{_mandir}/man8/*SAPHana*
%{_sbindir}/SAPHanaSR* %{_sbindir}/SAPHanaSR*
%{_usr}/lib/SAPHanaSR-ScaleOut %{_usr}/lib/%{saphana_prefix}
%{_datadir}/SAPHanaSR-ScaleOut %{_datadir}/%{saphana_prefix}
%exclude /etc %exclude /etc
%exclude /usr/include %exclude /usr/include
@ -200,39 +237,21 @@ rm -rf %{buildroot}/usr/share/doc/resource-agents
%exclude /usr/sbin/ocf* %exclude /usr/sbin/ocf*
%exclude /usr/share/resource-agents %exclude /usr/share/resource-agents
%exclude /usr/share/pkgconfig/resource-agents.pc %exclude /usr/share/pkgconfig/resource-agents.pc
%exclude /usr/src %exclude /usr/src
%changelog %changelog
* Thu Jan 20 2022 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.164.2-3 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1:0.185.3-0.1
- SAPHanaController/SAPHanaTopology: follow OCF standard for version - Bump release for October 2024 mass rebuild:
and OCF version in metadata Resolves: RHEL-64018
Resolves: rhbz#2042921
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1:0.164.2-2.1
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Mon Jun 14 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.164.2-2
- Add CI gating tests
Resolves: rhbz#1958970
* Mon Jun 7 2021 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.164.2-1
- Rebase to SAPHanaSR-ScaleOut 0.164.2 upstream release.
* Thu Apr 30 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.164.0-1 * Thu Jul 11 2024 Janine Fuchs <jfuchs@redhat.com> - 0.185.3
- Set default timeouts based on recommendations and a couple of bugfixes - Add package to RHEL 10.
Resolves: rhbz#1827107 Resolves: RHEL-40575
* Tue Feb 18 2020 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.163.2-6 - Change perl dependency to perl-interpreter.
- Add Conflicts: to avoid future CI gating errors
Resolves: rhbz#1802995 Resolves: RHEL-45725
* Thu Jun 27 2019 Oyvind Albrigtsen <oalbrigt@redhat.com> - 0.163.2-5
- Initial build as separate package
Resolves: rhbz#1705765 # vim:set ai ts=2 sw=2 sts=2 et:

Write Preview
Loading…
Cancel
Save