rpms/sap-cluster-connector
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix output parser mismatch since pacemaker 2.1.6.

Browse Source 
Resolves: RHEL-80315
This commit is contained in:
Janine Fuchs 2025-02-20 17:29:08 +01:00
parent 366433ed94
commit 368f71cd55
3 changed files with 14 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
bz1827096-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch
View File

@ -1,38 +0,0 @@
From 42d6ce2143f4439fed8c8b31e03dde655f1bbadb Mon Sep 17 00:00:00 2001
From: Frank Danapfel <frank.danapfel@redhat.com>
Date: Tue, 21 Apr 2020 14:11:36 +0200
Subject: [PATCH] Allow nodenames with dashes and/or underscores in lsn
function
---
redhat/sap_cluster_connector | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/redhat/sap_cluster_connector b/redhat/sap_cluster_connector
index a88b27a..6250887 100755
--- a/redhat/sap_cluster_connector
+++ b/redhat/sap_cluster_connector
@@ -401,7 +401,7 @@ sub list_sap_nodes {
chomp $crm_res_location_in;
#printf "DBG: where-result: %s\n", $crm_res_location_in;
my $current_node="";
- if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+(\w+)\W*/ ) {
+ if ( $crm_res_location_in =~ /^resource\s+(\w)+\sis running on:\s+([a-zA-Z0-9_-]+)/ ) {
#printf "DBG: where-result: match\n";
$current_node = $2;
}
@@ -425,12 +425,12 @@ sub list_sap_nodes {
while (<PTEST>) {
chomp;
# printf "%s\n", $_;
- if ( /^group_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
+ if ( /^group_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
# printf "DBG: group 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
$resource{$1}->{nodes}->{$2}->{gc}=$3;
push(@{$resource{$1}->{priorities}->{$3}}, $2);
}
- if ( /^native_color:\s*(\w+)\s+allocation score on\s+(\w+):\s+(.*)$/ ) {
+ if ( /^native_color:\s*(\w+)\s+allocation score on\s+([a-zA-Z0-9_-]+):\s+(.*)$/ ) {
# printf "DBG: native 1: %s, 2: %s, 3: %s\n", $1, $2, $3;
$resource{$1}->{nodes}->{$2}->{nc}=$3;
push(@{$resource{$1}->{priorities}->{$3}}, $2);

25
sap-cluster-connector.spec
View File

@ -20,21 +20,20 @@
#
%global sap_script_prefix sap_cluster_connector
%global sap_script_hash f3644f5
%global sap_script_hash ba8c22e
Name: sap-cluster-connector
Summary: SAP cluster connector script
Version: 3.0.1
Release: 8%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
Release: 10%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}
License: GPLv2+
URL: https://github.com/fdanapfel/sap_cluster_connector
URL: https://github.com/redhat-sap/sap_cluster_connector
%if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel}
Group: System Environment/Base
%else
Group: Productivity/Clustering/HA
%endif
Source0: %{sap_script_prefix}-%{sap_script_hash}.tar.gz
Patch0: bz1827096-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch
BuildArch: noarch
@ -49,21 +48,18 @@ instances to be managed in a cluster environment.
%prep
%setup -q -n %{sap_script_prefix}-%{sap_script_hash}
%patch -P 0 -p1
%build
%install
rm -rf %{buildroot}
test -d %{buildroot}/%{_bindir} || mkdir -p %{buildroot}/%{_bindir}
mkdir -p %{buildroot}/%{_datadir}/sap_cluster_connector
mkdir -p %{buildroot}/%{_mandir}/man8
cp redhat/sap_cluster_connector %{buildroot}/%{_bindir}
cp -rv redhat/{run_checks,checks} %{buildroot}/%{_datadir}/sap_cluster_connector
gzip redhat/man/*.8
cp redhat/man/*.8.gz %{buildroot}/%{_mandir}/man8
%clean
rm -rf %{buildroot}
cp sap_cluster_connector %{buildroot}/%{_bindir}
cp -rv {run_checks,checks} %{buildroot}/%{_datadir}/sap_cluster_connector
gzip man/*.8
cp man/*.8.gz %{buildroot}/%{_mandir}/man8
%files
%defattr(-,root,root)
@ -72,6 +68,11 @@ rm -rf %{buildroot}
%{_datadir}/sap_cluster_connector
%changelog
* Thu Feb 20 2025 Janine Fuchs <jfuchs@redhat.com> - 3.0.1-10
- Fix output parser mismatch since pacemaker 2.1.6.
Resolves: RHEL-80315
* Thu Dec 12 2024 Janine Fuchs <jfuchs@redhat.com> - 3.0.1-8
- Changed perl dependency to perl-interpreter

2
sources
View File

@ -1 +1 @@
SHA512 (sap_cluster_connector-f3644f5.tar.gz) = 9b4e85f9c5e28cb7416ceba11e381dcf51c4c4f49df427e771317650d768cce816dd2bb029b0de103761511940b4de2c01e610e2281d519d41b1e9c2d84d9033
SHA512 (sap_cluster_connector-ba8c22e.tar.gz) = d9b2107c24abf9bf30f239d3d86d6026a699072d61b266a467ca866a065751474f1ba8317e792492fc59cbaf7b2adad38d6a85f706ff978af5b7c6824af665bb