Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 06d18dd3ae |
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
||||
ClusterLabs-resource-agents-a6ccb93a.tar.gz
|
||||
sap-hana-ha-87a5781.tar.gz
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/usr/bin/bash
|
||||
|
||||
# NAME = name of the source unpack dir
|
||||
NAME="sap-hana-ha-87a5781"
|
||||
NAME="sap-hana-ha"
|
||||
|
||||
# BROOT = build root
|
||||
# Enable this path when using 'rpmbuild -bp'.
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up sap-hana-ha-87a5781/ra/SAPHanaController.patch101 sap-hana-ha-87a5781/ra/SAPHanaController
|
||||
--- sap-hana-ha-87a5781/ra/SAPHanaController.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/ra/SAPHanaController 2024-08-19 12:30:40.033351892 +0200
|
||||
diff -up sap-hana-ha/ra/SAPHanaController.patch101 sap-hana-ha/ra/SAPHanaController
|
||||
--- sap-hana-ha/ra/SAPHanaController.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/ra/SAPHanaController 2024-08-19 12:30:40.033351892 +0200
|
||||
@@ -47,11 +47,11 @@ OCF_FUNCTIONS_DIR="${OCF_FUNCTIONS_DIR:-
|
||||
source "${OCF_FUNCTIONS_DIR}/ocf-shellfuncs"
|
||||
# TODO PRIO1: NG - adjust the correct path and file name for the library to be sourced for first testing use current directory
|
||||
@ -16,9 +16,9 @@ diff -up sap-hana-ha-87a5781/ra/SAPHanaController.patch101 sap-hana-ha-87a5781/r
|
||||
|
||||
#
|
||||
#######################################################################
|
||||
diff -up sap-hana-ha-87a5781/ra/saphana-filesystem-lib.patch101 sap-hana-ha-87a5781/ra/saphana-filesystem-lib
|
||||
--- sap-hana-ha-87a5781/ra/saphana-filesystem-lib.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/ra/saphana-filesystem-lib 2024-08-19 12:30:40.034351894 +0200
|
||||
diff -up sap-hana-ha/ra/saphana-filesystem-lib.patch101 sap-hana-ha/ra/saphana-filesystem-lib
|
||||
--- sap-hana-ha/ra/saphana-filesystem-lib.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/ra/saphana-filesystem-lib 2024-08-19 12:30:40.034351894 +0200
|
||||
@@ -109,7 +109,7 @@ until it gains success or migration-thre
|
||||
</parameter>
|
||||
<parameter name="DIRECTORY" unique="0" required="0">
|
||||
@ -37,9 +37,9 @@ diff -up sap-hana-ha-87a5781/ra/saphana-filesystem-lib.patch101 sap-hana-ha-87a5
|
||||
pp_hana_shared="/run/SAPHanaFileSystem_poison_pill_${SID}"
|
||||
sid="${SID,,}"
|
||||
export sidadm="${sid}adm"
|
||||
diff -up sap-hana-ha-87a5781/ra/SAPHanaFilesystem.patch101 sap-hana-ha-87a5781/ra/SAPHanaFilesystem
|
||||
--- sap-hana-ha-87a5781/ra/SAPHanaFilesystem.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/ra/SAPHanaFilesystem 2024-08-19 12:30:40.033351892 +0200
|
||||
diff -up sap-hana-ha/ra/SAPHanaFilesystem.patch101 sap-hana-ha/ra/SAPHanaFilesystem
|
||||
--- sap-hana-ha/ra/SAPHanaFilesystem.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/ra/SAPHanaFilesystem 2024-08-19 12:30:40.033351892 +0200
|
||||
@@ -31,11 +31,11 @@ OCF_FUNCTIONS_DIR="${OCF_FUNCTIONS_DIR:-
|
||||
# shellcheck source=/dev/null
|
||||
source "${OCF_FUNCTIONS_DIR}/ocf-shellfuncs"
|
||||
@ -55,9 +55,9 @@ diff -up sap-hana-ha-87a5781/ra/SAPHanaFilesystem.patch101 sap-hana-ha-87a5781/r
|
||||
|
||||
#
|
||||
#######################################################################
|
||||
diff -up sap-hana-ha-87a5781/ra/SAPHanaTopology.patch101 sap-hana-ha-87a5781/ra/SAPHanaTopology
|
||||
--- sap-hana-ha-87a5781/ra/SAPHanaTopology.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/ra/SAPHanaTopology 2024-08-19 12:30:40.034351894 +0200
|
||||
diff -up sap-hana-ha/ra/SAPHanaTopology.patch101 sap-hana-ha/ra/SAPHanaTopology
|
||||
--- sap-hana-ha/ra/SAPHanaTopology.patch101 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/ra/SAPHanaTopology 2024-08-19 12:30:40.034351894 +0200
|
||||
@@ -43,9 +43,9 @@ OCF_FUNCTIONS_DIR="${OCF_FUNCTIONS_DIR:-
|
||||
source "${OCF_FUNCTIONS_DIR}/ocf-shellfuncs"
|
||||
# TODO PRIO1: NG - adjust the correct path and file name for the library to be sourced for first testing use current directory
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up sap-hana-ha-87a5781/srHook/global.ini_susChkSrv.patch100 sap-hana-ha-87a5781/srHook/global.ini_susChkSrv
|
||||
--- sap-hana-ha-87a5781/srHook/global.ini_susChkSrv.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/global.ini_susChkSrv 2024-08-19 12:30:39.985351798 +0200
|
||||
diff -up sap-hana-ha/srHook/global.ini_susChkSrv.patch100 sap-hana-ha/srHook/global.ini_susChkSrv
|
||||
--- sap-hana-ha/srHook/global.ini_susChkSrv.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/global.ini_susChkSrv 2024-08-19 12:30:39.985351798 +0200
|
||||
@@ -1,10 +1,10 @@
|
||||
-[ha_dr_provider_suschksrv]
|
||||
-provider = susChkSrv
|
||||
@ -16,9 +16,9 @@ diff -up sap-hana-ha-87a5781/srHook/global.ini_susChkSrv.patch100 sap-hana-ha-87
|
||||
-ha_dr_suschksrv = info
|
||||
+ha_dr_chksrv = info
|
||||
|
||||
diff -up sap-hana-ha-87a5781/srHook/global.ini_susCostOpt.patch100 sap-hana-ha-87a5781/srHook/global.ini_susCostOpt
|
||||
--- sap-hana-ha-87a5781/srHook/global.ini_susCostOpt.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/global.ini_susCostOpt 2024-08-19 12:30:39.986351800 +0200
|
||||
diff -up sap-hana-ha/srHook/global.ini_susCostOpt.patch100 sap-hana-ha/srHook/global.ini_susCostOpt
|
||||
--- sap-hana-ha/srHook/global.ini_susCostOpt.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/global.ini_susCostOpt 2024-08-19 12:30:39.986351800 +0200
|
||||
@@ -1,6 +1,6 @@
|
||||
[ha_dr_provider_susCostOpt]
|
||||
provider = susCostOpt
|
||||
@ -27,9 +27,9 @@ diff -up sap-hana-ha-87a5781/srHook/global.ini_susCostOpt.patch100 sap-hana-ha-8
|
||||
userKey = costoptkey
|
||||
execution_order = 1
|
||||
|
||||
diff -up sap-hana-ha-87a5781/srHook/global.ini_susHanaSR.patch100 sap-hana-ha-87a5781/srHook/global.ini_susHanaSR
|
||||
--- sap-hana-ha-87a5781/srHook/global.ini_susHanaSR.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/global.ini_susHanaSR 2024-08-19 12:30:39.986351800 +0200
|
||||
diff -up sap-hana-ha/srHook/global.ini_susHanaSR.patch100 sap-hana-ha/srHook/global.ini_susHanaSR
|
||||
--- sap-hana-ha/srHook/global.ini_susHanaSR.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/global.ini_susHanaSR 2024-08-19 12:30:39.986351800 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
-[ha_dr_provider_susHanaSR]
|
||||
-provider = susHanaSR
|
||||
@ -42,9 +42,9 @@ diff -up sap-hana-ha-87a5781/srHook/global.ini_susHanaSR.patch100 sap-hana-ha-87
|
||||
[trace]
|
||||
-ha_dr_sushanasr = info
|
||||
+ha_dr_hanasr = info
|
||||
diff -up sap-hana-ha-87a5781/srHook/global.ini_susTkOver.patch100 sap-hana-ha-87a5781/srHook/global.ini_susTkOver
|
||||
--- sap-hana-ha-87a5781/srHook/global.ini_susTkOver.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/global.ini_susTkOver 2024-08-19 12:30:39.987351802 +0200
|
||||
diff -up sap-hana-ha/srHook/global.ini_susTkOver.patch100 sap-hana-ha/srHook/global.ini_susTkOver
|
||||
--- sap-hana-ha/srHook/global.ini_susTkOver.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/global.ini_susTkOver 2024-08-19 12:30:39.987351802 +0200
|
||||
@@ -1,9 +1,9 @@
|
||||
-[ha_dr_provider_susTkOver]
|
||||
-provider = susTkOver
|
||||
@ -60,9 +60,9 @@ diff -up sap-hana-ha-87a5781/srHook/global.ini_susTkOver.patch100 sap-hana-ha-87
|
||||
-ha_dr_susTkOver = info
|
||||
+ha_dr_TkOver = info
|
||||
|
||||
diff -up sap-hana-ha-87a5781/srHook/susChkSrv.py.patch100 sap-hana-ha-87a5781/srHook/susChkSrv.py
|
||||
--- sap-hana-ha-87a5781/srHook/susChkSrv.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/susChkSrv.py 2024-08-19 12:30:39.989351806 +0200
|
||||
diff -up sap-hana-ha/srHook/susChkSrv.py.patch100 sap-hana-ha/srHook/susChkSrv.py
|
||||
--- sap-hana-ha/srHook/susChkSrv.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/susChkSrv.py 2024-08-19 12:30:39.989351806 +0200
|
||||
@@ -1,15 +1,15 @@
|
||||
# pylint: disable=invalid-name,fixme
|
||||
"""
|
||||
@ -137,9 +137,9 @@ diff -up sap-hana-ha-87a5781/srHook/susChkSrv.py.patch100 sap-hana-ha-87a5781/sr
|
||||
"provider_description": "Process service status changed events",
|
||||
"provider_version": "1.0"}
|
||||
|
||||
diff -up sap-hana-ha-87a5781/srHook/susCostOpt.py.patch100 sap-hana-ha-87a5781/srHook/susCostOpt.py
|
||||
--- sap-hana-ha-87a5781/srHook/susCostOpt.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/susCostOpt.py 2024-08-19 12:30:39.989351806 +0200
|
||||
diff -up sap-hana-ha/srHook/susCostOpt.py.patch100 sap-hana-ha/srHook/susCostOpt.py
|
||||
--- sap-hana-ha/srHook/susCostOpt.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/susCostOpt.py 2024-08-19 12:30:39.989351806 +0200
|
||||
@@ -94,7 +94,7 @@ class susCostOpt(HADRBase):
|
||||
self.tracer.info(f"{self.__class__.__name__}.{method}() version {FHSRHOOKVERSION}")
|
||||
desc = ("postTakeover script to reset parameters to default or set parameters as"
|
||||
@ -149,9 +149,9 @@ diff -up sap-hana-ha-87a5781/srHook/susCostOpt.py.patch100 sap-hana-ha-87a5781/s
|
||||
"provider_name": "susCostOpt", # class name
|
||||
"provider_description": desc,
|
||||
"provider_version": "1.0"}
|
||||
diff -up sap-hana-ha-87a5781/srHook/susHanaSrMultiTarget.py.to-be-integrated.patch100 sap-hana-ha-87a5781/srHook/susHanaSrMultiTarget.py.to-be-integrated
|
||||
--- sap-hana-ha-87a5781/srHook/susHanaSrMultiTarget.py.to-be-integrated.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/susHanaSrMultiTarget.py.to-be-integrated 2024-08-19 12:30:39.992351812 +0200
|
||||
diff -up sap-hana-ha/srHook/susHanaSrMultiTarget.py.to-be-integrated.patch100 sap-hana-ha/srHook/susHanaSrMultiTarget.py.to-be-integrated
|
||||
--- sap-hana-ha/srHook/susHanaSrMultiTarget.py.to-be-integrated.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/susHanaSrMultiTarget.py.to-be-integrated 2024-08-19 12:30:39.992351812 +0200
|
||||
@@ -100,7 +100,7 @@ try:
|
||||
def about(self):
|
||||
method = "about"
|
||||
@ -161,9 +161,9 @@ diff -up sap-hana-ha-87a5781/srHook/susHanaSrMultiTarget.py.to-be-integrated.pat
|
||||
"provider_name": "SAPHanaSrMultiTarget", # class name
|
||||
"provider_description": "Inform Cluster about SR state",
|
||||
"provider_version": "1.0"}
|
||||
diff -up sap-hana-ha-87a5781/srHook/susHanaSR.py.patch100 sap-hana-ha-87a5781/srHook/susHanaSR.py
|
||||
--- sap-hana-ha-87a5781/srHook/susHanaSR.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/susHanaSR.py 2024-08-19 12:30:39.990351808 +0200
|
||||
diff -up sap-hana-ha/srHook/susHanaSR.py.patch100 sap-hana-ha/srHook/susHanaSR.py
|
||||
--- sap-hana-ha/srHook/susHanaSR.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/susHanaSR.py 2024-08-19 12:30:39.990351808 +0200
|
||||
@@ -17,9 +17,9 @@ import os
|
||||
|
||||
|
||||
@ -226,9 +226,9 @@ diff -up sap-hana-ha-87a5781/srHook/susHanaSR.py.patch100 sap-hana-ha-87a5781/sr
|
||||
f" {self.__class__.__name__}.srConnectionChanged ignoring bad"
|
||||
f" SR status because of is_in_sync=True (reason={my_reason})")
|
||||
my_srs = ""
|
||||
diff -up sap-hana-ha-87a5781/srHook/susTkOver.py.patch100 sap-hana-ha-87a5781/srHook/susTkOver.py
|
||||
--- sap-hana-ha-87a5781/srHook/susTkOver.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/srHook/susTkOver.py 2024-08-19 12:30:39.994351816 +0200
|
||||
diff -up sap-hana-ha/srHook/susTkOver.py.patch100 sap-hana-ha/srHook/susTkOver.py
|
||||
--- sap-hana-ha/srHook/susTkOver.py.patch100 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/srHook/susTkOver.py 2024-08-19 12:30:39.994351816 +0200
|
||||
@@ -5,17 +5,17 @@
|
||||
# License: GNU General Public License (GPL)
|
||||
# Copyright: (c) 2022 SUSE LLC
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
diff -up sap-hana-ha-87a5781/tools/notes/query_hadr_providers.patch102 sap-hana-ha-87a5781/tools/notes/query_hadr_providers
|
||||
--- sap-hana-ha-87a5781/tools/notes/query_hadr_providers.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/tools/notes/query_hadr_providers 2024-08-19 12:30:40.049351923 +0200
|
||||
diff -up sap-hana-ha/tools/notes/query_hadr_providers.patch102 sap-hana-ha/tools/notes/query_hadr_providers
|
||||
--- sap-hana-ha/tools/notes/query_hadr_providers.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/tools/notes/query_hadr_providers 2024-08-19 12:30:40.049351923 +0200
|
||||
@@ -1,7 +1,7 @@
|
||||
hdbsql -U TESTER 'select * from M_HA_DR_PROVIDERS
|
||||
|
||||
@ -11,9 +11,9 @@ diff -up sap-hana-ha-87a5781/tools/notes/query_hadr_providers.patch102 sap-hana-
|
||||
+# "TkOver","SUSE","Inform Cluster about SR state","1.0","GENERIC","/usr/share/sap-hana-ha",1
|
||||
# 2 rows selected (overall time 3161 usec; server time 329 usec)
|
||||
|
||||
diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy
|
||||
--- sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy 2024-08-19 12:30:40.048351921 +0200
|
||||
diff -up sap-hana-ha/tools/SAPHanaSR-monitor-legacy.patch102 sap-hana-ha/tools/SAPHanaSR-monitor-legacy
|
||||
--- sap-hana-ha/tools/SAPHanaSR-monitor-legacy.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/tools/SAPHanaSR-monitor-legacy 2024-08-19 12:30:40.048351921 +0200
|
||||
@@ -14,7 +14,7 @@ use Sys::Syslog;
|
||||
use Sys::Hostname;
|
||||
use File::Path;
|
||||
@ -23,9 +23,9 @@ diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-monitor-legacy.patch102 sap-hana-ha
|
||||
use lib '/usr/lib/SAPHanaSR';
|
||||
use SAPHanaSRTools;
|
||||
|
||||
diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy
|
||||
--- sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy 2024-08-19 12:30:40.048351921 +0200
|
||||
diff -up sap-hana-ha/tools/SAPHanaSR-replay-archive-legacy.patch102 sap-hana-ha/tools/SAPHanaSR-replay-archive-legacy
|
||||
--- sap-hana-ha/tools/SAPHanaSR-replay-archive-legacy.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/tools/SAPHanaSR-replay-archive-legacy 2024-08-19 12:30:40.048351921 +0200
|
||||
@@ -179,7 +179,7 @@ if [ -n "$outDir" ]; then
|
||||
mkdir -p "$outDir"
|
||||
case "$format" in
|
||||
@ -35,9 +35,9 @@ diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive-legacy.patch102 sap-
|
||||
;;
|
||||
esac
|
||||
outNr=0
|
||||
diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive
|
||||
--- sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive 2024-08-19 12:30:40.048351921 +0200
|
||||
diff -up sap-hana-ha/tools/SAPHanaSR-replay-archive.patch102 sap-hana-ha/tools/SAPHanaSR-replay-archive
|
||||
--- sap-hana-ha/tools/SAPHanaSR-replay-archive.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/tools/SAPHanaSR-replay-archive 2024-08-19 12:30:40.048351921 +0200
|
||||
@@ -24,7 +24,7 @@ import os
|
||||
import re
|
||||
import sys
|
||||
@ -47,9 +47,9 @@ diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-replay-archive.patch102 sap-hana-ha
|
||||
from saphana_sr_tools import HanaCluster,HanaStatus
|
||||
# pylint: enable=wrong-import-position
|
||||
# pylint: enable=unused-import
|
||||
diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy
|
||||
--- sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy 2024-08-19 12:30:40.049351923 +0200
|
||||
diff -up sap-hana-ha/tools/SAPHanaSR-showAttr-legacy.patch102 sap-hana-ha/tools/SAPHanaSR-showAttr-legacy
|
||||
--- sap-hana-ha/tools/SAPHanaSR-showAttr-legacy.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/tools/SAPHanaSR-showAttr-legacy 2024-08-19 12:30:40.049351923 +0200
|
||||
@@ -17,7 +17,7 @@ use Sys::Syslog;
|
||||
use Sys::Hostname;
|
||||
use File::Path;
|
||||
@ -59,9 +59,9 @@ diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr-legacy.patch102 sap-hana-h
|
||||
use lib '/usr/lib/SAPHanaSR';
|
||||
use SAPHanaSRTools;
|
||||
|
||||
diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr
|
||||
--- sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr 2024-08-19 12:30:40.048351921 +0200
|
||||
diff -up sap-hana-ha/tools/SAPHanaSR-showAttr.patch102 sap-hana-ha/tools/SAPHanaSR-showAttr
|
||||
--- sap-hana-ha/tools/SAPHanaSR-showAttr.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/tools/SAPHanaSR-showAttr 2024-08-19 12:30:40.048351921 +0200
|
||||
@@ -23,7 +23,7 @@ import os
|
||||
import re
|
||||
import sys
|
||||
@ -71,9 +71,9 @@ diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-showAttr.patch102 sap-hana-ha-87a57
|
||||
from saphana_sr_tools import HanaCluster,HanaStatus
|
||||
# pylint: enable=wrong-import-position
|
||||
# pylint: enable=unused-import
|
||||
diff -up sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo.patch102 sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo
|
||||
--- sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha-87a5781/tools/SAPHanaSR-upgrade-to-angi-demo 2024-08-19 12:30:40.049351923 +0200
|
||||
diff -up sap-hana-ha/tools/SAPHanaSR-upgrade-to-angi-demo.patch102 sap-hana-ha/tools/SAPHanaSR-upgrade-to-angi-demo
|
||||
--- sap-hana-ha/tools/SAPHanaSR-upgrade-to-angi-demo.patch102 2024-07-08 14:39:04.000000000 +0200
|
||||
+++ sap-hana-ha/tools/SAPHanaSR-upgrade-to-angi-demo 2024-08-19 12:30:40.049351923 +0200
|
||||
@@ -20,7 +20,7 @@ TMP=/run/"$EXE"."$RANDOM"
|
||||
TIMEST=$(date +%s)
|
||||
ALL_RC=0
|
||||
|
||||
224
sap-hana-ha.spec
224
sap-hana-ha.spec
@ -11,6 +11,18 @@
|
||||
|
||||
# Below are the steps to prepare the source files.
|
||||
#
|
||||
# Use a specified version as HEAD if needed, e.g. "v4.14.0"
|
||||
#
|
||||
# # Source0:
|
||||
# git checkout <version tag>
|
||||
# TAG=$(git log --pretty="format:%h" -n 1)
|
||||
# distdir="ClusterLabs-resource-agents-${TAG}"
|
||||
# TARFILE="${distdir}.tar.gz"
|
||||
# rm -rf $TARFILE $distdir
|
||||
# git archive --prefix=$distdir/ HEAD | gzip > $TARFILE
|
||||
#
|
||||
# # Source1:
|
||||
#
|
||||
# 1) The script to generate a new source file from the SAPHanaSR
|
||||
# upstream git repo.
|
||||
#
|
||||
@ -30,19 +42,43 @@
|
||||
# Always carefully review the results of the patches, there is no
|
||||
# automatic check elsewhere!
|
||||
|
||||
%global upstream_prefix ClusterLabs-resource-agents
|
||||
%global upstream_version a6ccb93a
|
||||
|
||||
# Use %%{name}
|
||||
# %%global name sap-hana-ha
|
||||
%global saphana_hash 87a5781
|
||||
|
||||
# Whether this platform defaults to using systemd as an init system
|
||||
# (needs to be evaluated prior to BuildRequires being enumerated and
|
||||
# installed as it's intended to conditionally select some of these, and
|
||||
# for that there are only few indicators with varying reliability:
|
||||
# - presence of systemd-defined macros (when building in a full-fledged
|
||||
# environment, which is not the case with ordinary mock-based builds)
|
||||
# - systemd-aware rpm as manifested with the presence of particular
|
||||
# macro (rpm itself will trivially always be present when building)
|
||||
# - existence of /usr/lib/os-release file, which is something heavily
|
||||
# propagated by systemd project
|
||||
# - when not good enough, there's always a possibility to check
|
||||
# particular distro-specific macros (incl. version comparison)
|
||||
%define systemd_native (%{?_unitdir:1}%{!?_unitdir:0}%{nil \
|
||||
} || %{?__transaction_systemd_inhibit:1}%{!?__transaction_systemd_inhibit:0}%{nil \
|
||||
} || %(test -f /usr/lib/os-release; test $? -ne 0; echo $?))
|
||||
|
||||
# determine the ras-set to process based on configure invocation
|
||||
%bcond_with rgmanager
|
||||
%bcond_without linuxha
|
||||
|
||||
Name: sap-hana-ha
|
||||
Summary: Cluster resource HA for SAP HANA in System Replication
|
||||
Version: 1.2.8
|
||||
Release: 2%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
Release: 3%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
|
||||
License: GPLv2+
|
||||
URL: https://github.com/SUSE/SAPHanaSR
|
||||
Source0: %{name}-%{saphana_hash}.tar.gz
|
||||
Source0: %{upstream_prefix}-%{upstream_version}.tar.gz
|
||||
Source1: %{name}-%{saphana_hash}.tar.gz
|
||||
# Unpackaged source, just to make sure centpkg keeps it.
|
||||
Source1: create-rename-patches.sh
|
||||
Source2: create-rename-patches.sh
|
||||
|
||||
# Patches that will always be needed.
|
||||
# Other patches: handle conflicts if diff lines overlap
|
||||
@ -52,6 +88,38 @@ Patch102: patterns-tools-files.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
# Build dependencies
|
||||
BuildRequires: make
|
||||
BuildRequires: automake autoconf pkgconfig gcc
|
||||
BuildRequires: libxslt glib2-devel libqb-devel
|
||||
BuildRequires: systemd
|
||||
BuildRequires: which
|
||||
|
||||
%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version}
|
||||
BuildRequires: python3-devel
|
||||
%else
|
||||
BuildRequires: python-devel
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora} || 0%{?centos} || 0%{?rhel}
|
||||
BuildRequires: docbook-style-xsl docbook-dtds
|
||||
%if 0%{?rhel} == 0
|
||||
BuildRequires: libnet-devel
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if 0%{?suse_version}
|
||||
BuildRequires: libnet-devel
|
||||
%if 0%{?suse_version} > 1500
|
||||
BuildRequires: cluster-glue-devel
|
||||
%else
|
||||
BuildRequires: libglue-devel
|
||||
%endif
|
||||
BuildRequires: libxslt docbook_4 docbook-xsl-stylesheets
|
||||
%endif
|
||||
|
||||
Requires: resource-agents >= 4.8.0
|
||||
|
||||
# Package dependencies
|
||||
Requires: resource-agents >= 4.8.0
|
||||
Conflicts: resource-agents-sap-hana
|
||||
@ -68,9 +136,15 @@ environment.
|
||||
|
||||
|
||||
%prep
|
||||
# Unpack the source and apply patches automatically.
|
||||
%autosetup -N -n %{name}-%{saphana_hash}
|
||||
%autopatch -p 1
|
||||
# Unpack the Clusterlabs source
|
||||
%setup -q -n %{upstream_prefix}-%{upstream_version}
|
||||
%setup -q -T -D -a 1 -n %{upstream_prefix}-%{upstream_version}
|
||||
|
||||
# Rename the unpacked SAP dir to strip the suffix off.
|
||||
mv %{name}-%{saphana_hash} %{name}
|
||||
|
||||
# Apply the patches that fix some names and patterns
|
||||
%autopatch -p0
|
||||
|
||||
# Fail if there are patterns found after patching.
|
||||
# Recreate the patches if the source files changed.
|
||||
@ -85,12 +159,101 @@ grep -r \
|
||||
-e "sushanasr" \
|
||||
-e "SAPHanaSR-angi" \
|
||||
-e "suse_SAPHanaFilesystem" \
|
||||
srHook/ ra/ tools/ && {
|
||||
%{name}/tools/ %{name}/srHook/ %{name}/ra/ && {
|
||||
echo -e "\v>>> CHECK FAILED: Patterns found after patching. Fix the patches.\v"
|
||||
exit 1
|
||||
} || echo "CHECK PASSED: No unpatched patterns found"
|
||||
|
||||
|
||||
### The following is required to get the files in a shape that the compilation
|
||||
### and man page generation through the Clusterlabs code works.
|
||||
### The files are moved temporarily to places, adjusted to work at compilation time,
|
||||
### but the package will use the files from their original path of the SAP package source.
|
||||
|
||||
# Copy the agents and libs to the heartbeat dir for the ClusterLabs included processing.
|
||||
# Keep them in the original place! They are used for the package.
|
||||
cp %{name}/ra/SAP* heartbeat
|
||||
cp %{name}/ra/sap* heartbeat
|
||||
|
||||
# Required for working in the buildroot:
|
||||
# Fix the paths to source the r-a libs in their temporary build path.
|
||||
sed -i -e 's#/usr/lib/%{name}/#${OCF_FUNCTIONS_DIR}/#g' heartbeat/SAPHana*
|
||||
|
||||
# Find the existing SAPInstance entry in the list and add new after in corresponding formatting.
|
||||
# heartbeat/Makefile.am indents by 3 tabs in the target list.
|
||||
# Skip the .in suffix, the agent is renamed in the process.
|
||||
sed -i -e 's/\(\t\tSAPInstance\t\t\\\)/\1\n\t\t\tSAPHanaController\t\t\\/' heartbeat/Makefile.am
|
||||
sed -i -e 's/\(\t\tSAPInstance\t\t\\\)/\1\n\t\t\tSAPHanaFilesystem\t\t\\/' heartbeat/Makefile.am
|
||||
sed -i -e 's/\(\t\tSAPInstance\t\t\\\)/\1\n\t\t\tSAPHanaTopology\t\t\\/' heartbeat/Makefile.am
|
||||
# Add the libs after sapdb.sh in ocfcommon_DATA.
|
||||
# The block indents by 3 tabs + 2 spaces.
|
||||
sed -i -e 's/\(\t\t\t sapdb.sh\t\t\\\)/\1\n\t\t\t saphana-common-lib\t\\/' heartbeat/Makefile.am
|
||||
sed -i -e 's/\(\t\t\t sapdb.sh\t\t\\\)/\1\n\t\t\t saphana-controller-common-lib\t\\/' heartbeat/Makefile.am
|
||||
sed -i -e 's/\(\t\t\t sapdb.sh\t\t\\\)/\1\n\t\t\t saphana-controller-lib\t\\/' heartbeat/Makefile.am
|
||||
sed -i -e 's/\(\t\t\t sapdb.sh\t\t\\\)/\1\n\t\t\t saphana-filesystem-lib\t\\/' heartbeat/Makefile.am
|
||||
sed -i -e 's/\(\t\t\t sapdb.sh\t\t\\\)/\1\n\t\t\t saphana-topology-lib\t\\/' heartbeat/Makefile.am
|
||||
|
||||
# Find the existing SAPInstance entry in the list and add new after in corresponding formatting.
|
||||
# The block in 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 \\/' doc/man/Makefile.am
|
||||
sed -i -e 's/\( \{26\}ocf_heartbeat_SAPInstance.7 \\\)/\1\n'\
|
||||
' ocf_heartbeat_SAPHanaFilesystem.7 \\/' doc/man/Makefile.am
|
||||
sed -i -e 's/\( \{26\}ocf_heartbeat_SAPInstance.7 \\\)/\1\n'\
|
||||
' ocf_heartbeat_SAPHanaTopology.7 \\/' doc/man/Makefile.am
|
||||
|
||||
### build and configure sections are needed for the build of the Clusterlabs source
|
||||
### and the resulting man pages that we need.
|
||||
%build
|
||||
if [ ! -f configure ]; then
|
||||
./autogen.sh
|
||||
fi
|
||||
|
||||
%if 0%{?fedora} >= 11 || 0%{?centos} > 5 || 0%{?rhel} > 5
|
||||
CFLAGS="$(echo '%{optflags}')"
|
||||
%global conf_opt_fatal "--enable-fatal-warnings=no"
|
||||
%else
|
||||
CFLAGS="${CFLAGS} ${RPM_OPT_FLAGS}"
|
||||
%global conf_opt_fatal "--enable-fatal-warnings=yes"
|
||||
%endif
|
||||
|
||||
%if %{with rgmanager}
|
||||
%global rasset rgmanager
|
||||
%endif
|
||||
%if %{with linuxha}
|
||||
%global rasset linux-ha
|
||||
%endif
|
||||
%if %{with rgmanager} && %{with linuxha}
|
||||
%global rasset all
|
||||
%endif
|
||||
|
||||
export CFLAGS
|
||||
|
||||
%configure \
|
||||
%if 0%{?fedora} || 0%{?centos} > 7 || 0%{?rhel} > 7 || 0%{?suse_version}
|
||||
PYTHON="%{__python3}" \
|
||||
%endif
|
||||
%{conf_opt_fatal} \
|
||||
%if %{defined _unitdir}
|
||||
--with-systemdsystemunitdir=%{_unitdir} \
|
||||
%endif
|
||||
%if %{defined _tmpfilesdir}
|
||||
--with-systemdtmpfilesdir=%{_tmpfilesdir} \
|
||||
--with-rsctmpdir=/run/resource-agents \
|
||||
%endif
|
||||
--with-pkg-name=resource-agents \
|
||||
--with-ras-set=%{rasset}
|
||||
|
||||
make %{_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf %{buildroot}
|
||||
make install DESTDIR=%{buildroot}
|
||||
|
||||
# Remove all ocf contents and unrelated man pages
|
||||
find %{buildroot}/usr/lib/ocf ! -type d -exec rm {} \;
|
||||
find %{buildroot}%{_mandir} -type f ! -iname "*SAP*" -exec rm {} \;
|
||||
|
||||
# Dir structure
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
mkdir -p %{buildroot}%{_datadir}/%{name}/samples
|
||||
@ -98,35 +261,62 @@ mkdir -p %{buildroot}%{_usr}/lib/%{name}
|
||||
mkdir -p %{buildroot}%{_usr}/lib/ocf/resource.d/heartbeat
|
||||
|
||||
# Resource agents and r-a libraries
|
||||
install -m 0755 ra/SAPHana* %{buildroot}%{_usr}/lib/ocf/resource.d/heartbeat
|
||||
install -m 0644 ra/saphana-*-lib %{buildroot}%{_usr}/lib/%{name}
|
||||
install -m 0755 %{name}/ra/SAPHana* %{buildroot}%{_usr}/lib/ocf/resource.d/heartbeat
|
||||
install -m 0644 %{name}/ra/saphana-*-lib %{buildroot}%{_usr}/lib/%{name}
|
||||
|
||||
# Hook scripts - sanitize upstream names where needed
|
||||
install -m 0644 srHook/susHanaSR.py %{buildroot}%{_datadir}/%{name}/HanaSR.py
|
||||
install -m 0644 srHook/susChkSrv.py %{buildroot}%{_datadir}/%{name}/ChkSrv.py
|
||||
install -m 0644 %{name}/srHook/susHanaSR.py %{buildroot}%{_datadir}/%{name}/HanaSR.py
|
||||
install -m 0644 %{name}/srHook/susChkSrv.py %{buildroot}%{_datadir}/%{name}/ChkSrv.py
|
||||
|
||||
# Select sample config files
|
||||
install -m 0444 srHook/global.ini_susHanaSR %{buildroot}/%{_datadir}/%{name}/samples/global.ini_HanaSR
|
||||
install -m 0444 srHook/global.ini_susChkSrv %{buildroot}/%{_datadir}/%{name}/samples/global.ini_ChkSrv
|
||||
install -m 0444 %{name}/srHook/global.ini_susHanaSR %{buildroot}/%{_datadir}/%{name}/samples/global.ini_HanaSR
|
||||
install -m 0444 %{name}/srHook/global.ini_susChkSrv %{buildroot}/%{_datadir}/%{name}/samples/global.ini_ChkSrv
|
||||
|
||||
# Scripts for some add-on functionality.
|
||||
# saphana_sr_tools is a lib imported by SAPHanaSR-* python scripts.
|
||||
install -m 0555 tools/SAPHanaSR-showAttr %{buildroot}%{_bindir}
|
||||
install -m 0444 tools/saphana_sr_tools.py %{buildroot}%{_usr}/lib/%{name}
|
||||
install -m 0555 %{name}/tools/SAPHanaSR-showAttr %{buildroot}%{_bindir}
|
||||
install -m 0444 %{name}/tools/saphana_sr_tools.py %{buildroot}%{_usr}/lib/%{name}
|
||||
|
||||
## tree fixup
|
||||
# remove docs (there is only one and they should come from doc sections in files)
|
||||
rm -rf %{buildroot}/usr/share/doc/resource-agents
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%license LICENSE
|
||||
%license %{name}/LICENSE
|
||||
%dir %{_datadir}/%{name}
|
||||
%dir %{_usr}/lib/%{name}
|
||||
%{_bindir}/*
|
||||
%{_datadir}/%{name}/*
|
||||
%{_usr}/lib/ocf/resource.d/heartbeat/*
|
||||
%{_mandir}/man7/*SAPHana*
|
||||
%{_usr}/lib/ocf/resource.d/heartbeat/SAPHana*
|
||||
%{_usr}/lib/%{name}/*
|
||||
|
||||
%exclude /etc
|
||||
%exclude /usr/include
|
||||
%exclude %{_usr}/lib/debug
|
||||
%exclude %{_usr}/lib/tmpfiles.d
|
||||
%exclude /usr/libexec/heartbeat
|
||||
%exclude /usr/lib/systemd
|
||||
%exclude /usr/sbin/ldirectord
|
||||
%exclude /usr/sbin/ocf*
|
||||
%exclude /usr/share/man/man7/*SAPDatabase*
|
||||
%exclude /usr/share/man/man7/*SAPInstance*
|
||||
%exclude /usr/share/resource-agents
|
||||
%exclude /usr/share/pkgconfig/resource-agents.pc
|
||||
%exclude /usr/src
|
||||
|
||||
%changelog
|
||||
* Fri Jan 17 2025 Janine Fuchs <jfuchs@redhat.com> - 1.2.8-3
|
||||
- Include man pages.
|
||||
|
||||
Resolves: RHEL-74289
|
||||
|
||||
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.2.8-2.1
|
||||
- Bump release for October 2024 mass rebuild:
|
||||
Resolves: RHEL-64018
|
||||
|
||||
* Tue Aug 13 2024 Janine Fuchs <jfuchs@redhat.com> - 1.2.8-2
|
||||
- Add package to RHEL 10.
|
||||
|
||||
|
||||
1
sources
1
sources
@ -1 +1,2 @@
|
||||
SHA512 (ClusterLabs-resource-agents-a6ccb93a.tar.gz) = 3ea92f051f16efbd0845d193cc7d2e7d8e9f66ba8e2bbba3a7b8d093ceff3103f8077b93037067dee8962a7d5c1ad0a0b5642acbaf385b0619cef96f18928911
|
||||
SHA512 (sap-hana-ha-87a5781.tar.gz) = b772906a774b4eb0b29b2fafb289ecc410329eea7425e93814477a61a9d4b1a3971010d9eab7d38769555c2e66c29fb2e9df3117f11d43d8677537965966b07d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user