From a9c9ca3a666fbd204db3865dc57fb925bb7e9058 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 23 2020 11:12:36 +0000 Subject: import resource-agents-4.1.1-46.el7_8.2 --- diff --git a/SOURCES/bz1834796-sap-hana-scaleout-1-timeouts-recommendations.patch b/SOURCES/bz1834796-sap-hana-scaleout-1-timeouts-recommendations.patch new file mode 100644 index 0000000..2d919a7 --- /dev/null +++ b/SOURCES/bz1834796-sap-hana-scaleout-1-timeouts-recommendations.patch @@ -0,0 +1,34 @@ +From 5c868c9d17e1c07711ee5423ed26d8f0f6562692 Mon Sep 17 00:00:00 2001 +From: Frank Danapfel +Date: Wed, 25 Mar 2020 11:09:49 +0100 +Subject: [PATCH] SAPHanaController: update start/stop/promote/monitor action + default timeouts to match official recommendations + +--- + SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController +index 1781b99..08239ed 100755 +--- a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController ++++ b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController +@@ -269,13 +269,13 @@ The resource agent uses the following four interfaces provided by SAP: + + + +- +- ++ ++ + +- +- +- +- ++ ++ ++ ++ + + + diff --git a/SOURCES/bz1834796-sap-hana-scaleout-2-timeouts-recommendations.patch b/SOURCES/bz1834796-sap-hana-scaleout-2-timeouts-recommendations.patch new file mode 100644 index 0000000..f8ac9fa --- /dev/null +++ b/SOURCES/bz1834796-sap-hana-scaleout-2-timeouts-recommendations.patch @@ -0,0 +1,28 @@ +From 2039335555b89262b325d1ceb03844cfabe35869 Mon Sep 17 00:00:00 2001 +From: Frank Danapfel +Date: Wed, 25 Mar 2020 11:04:46 +0100 +Subject: [PATCH] SAPHanaTopology: update start/stop/monitor action default + timeouts to match official recommendations + +--- + SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology +index 1e9a5c6..c83901a 100755 +--- a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology ++++ b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology +@@ -189,10 +189,10 @@ SAPHanaTopology scans the output table of landscapeHostConfiguration.py to ident + + + +- +- ++ ++ + +- ++ + + + diff --git a/SOURCES/bz1834796-sap-hana-scaleout-3-fixes.patch b/SOURCES/bz1834796-sap-hana-scaleout-3-fixes.patch new file mode 100644 index 0000000..e424e21 --- /dev/null +++ b/SOURCES/bz1834796-sap-hana-scaleout-3-fixes.patch @@ -0,0 +1,108 @@ +From 600160015e965ea67f716e1a332fbd92b855807c Mon Sep 17 00:00:00 2001 +From: AngelaBriel +Date: Tue, 12 Nov 2019 18:05:14 +0100 +Subject: [PATCH] Use a fall-back scoring for the master nameserver nodes, if + the current roles of the node(s) got lost. (bsc#1156067) version bump to + 0.164.0 remove old version(11SP3 from Dez. 2014) of + SAPHana/doc/SAPHanaSR-Setup-Guide.pdf. Add a Link to + https://www.suse.com/products/sles-for-sap/resource-library/sap-best-practices.html + instead. + +--- + SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.changes | 11 +++++++++++ + SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.spec | 3 ++- + SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController | 4 +++- + SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology | 3 ++- + 4 files changed, 19 insertions(+), 3 deletions(-) + create mode 100644 .gitignore + +diff --git a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.changes b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.changes +index fea4c46..9749d8b 100644 +--- a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.changes ++++ b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.changes +@@ -1,3 +1,14 @@ ++------------------------------------------------------------------- ++Mon Nov 11 10:44:44 UTC 2019 - abriel@suse.com ++ ++- change version to 0.164.0 ++- restart sapstartsrv service on master nameserver node ++ (bsc#1156150) ++- Use a fall-back scoring for the master nameserver nodes, if the ++ current roles of the node(s) got lost. ++ (bsc#1156067) ++- clean up package, add checks, correct typos ++ + ------------------------------------------------------------------- + Wed Sep 12 12:19:06 UTC 2018 - clanig@suse.de + +diff --git a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.spec b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.spec +index 4dc7093..4790be6 100644 +--- a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.spec ++++ b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/SAPHanaSR-ScaleOut.spec +@@ -2,6 +2,7 @@ + # spec file for package SAPHanaSR-ScaleOut + # + # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. ++# Copyright (c) 2017-2019 SUSE LLC + # + # All modifications and additions to the file contributed by third parties + # remain the property of their copyright owners, unless otherwise agreed +@@ -20,7 +21,7 @@ License: GPL-2.0 + Group: Productivity/Clustering/HA + AutoReqProv: on + Summary: Resource agents to control the HANA database in system replication setup +-Version: 0.163.2 ++Version: 0.164.0 + Release: 0 + Url: http://scn.sap.com/community/hana-in-memory/blog/2014/04/04/fail-safe-operation-of-sap-hana-suse-extends-its-high-availability-solution + Source0: SAPHanaSR-ScaleOut-%{version}.tar.bz2 +diff --git a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController +index 5b24513..1781b99 100755 +--- a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController ++++ b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController +@@ -12,6 +12,7 @@ + # License: GNU General Public License (GPL) + # Copyright: (c) 2013,2014 SUSE Linux Products GmbH + # Copyright: (c) 2015-2016 SUSE Linux GmbH ++# Copyright: (c) 2017-2019 SUSE LLC + # + # An example usage: + # See usage() function below for more details... +@@ -33,7 +34,7 @@ + # systemReplicationStatus.py (>= SPS090) + # + ####################################################################### +-SAPHanaControllerVersion="0.163.2" ++SAPHanaControllerVersion="0.164.0" + # + # Initialization: + timeB=$(date '+%s') +@@ -702,6 +703,7 @@ function saphana_init() { + # + SCORING_TABLE_PREFERRED_SITE_TAKEOVER=( + "[234]:P:master[123]:master .* 150" ++ "[234]:P:master[123] .* 140" + "[234]:P:master[123]:slave:.*:standby .* 115" + "[234]:P:master[123]:slave .* 110" + "[015]:P:master[123]: .* 70" +diff --git a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology +index 2e3b065..1e9a5c6 100755 +--- a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology ++++ b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaTopology +@@ -14,6 +14,7 @@ + # License: GNU General Public License (GPL) + # Copyright: (c) 2014 SUSE Linux Products GmbH + # (c) 2015-2016 SUSE Linux GmbH ++# (c) 2017-2019 SUSE LLC + # + # An example usage: + # See usage() function below for more details... +@@ -25,7 +26,7 @@ + # + ####################################################################### + # DONE PRIO 1: AFTER(!) SAP HANA SPS12 is available we could use hdbnsutil --sr_stateConfiguration +-SAPHanaTopologyVersion="0.163.2" ++SAPHanaTopologyVersion="0.164.0" + # + # Initialization: + timeB=$(date '+%s') diff --git a/SOURCES/bz1834796-sap-hana-scaleout-4-sapstartsrv-fix.patch b/SOURCES/bz1834796-sap-hana-scaleout-4-sapstartsrv-fix.patch new file mode 100644 index 0000000..13b8914 --- /dev/null +++ b/SOURCES/bz1834796-sap-hana-scaleout-4-sapstartsrv-fix.patch @@ -0,0 +1,25 @@ +From 60eb13d27b8be8f38ab037432de9a8a14181f207 Mon Sep 17 00:00:00 2001 +From: Fabian Herschel +Date: Thu, 7 Nov 2019 15:52:42 +0100 +Subject: [PATCH] bsc#1156150: SAPHanaSR: sapstartsrv service on + master_nameserver node not restarted when being forcefully killed + +--- + SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController +index e139053..5b24513 100755 +--- a/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController ++++ b/SAPHanaSR-ScaleOut-a77e8c6/SAPHana/ra/SAPHanaController +@@ -2569,8 +2569,10 @@ function saphana_monitor_clone() { + # + check_for_primary; primary_status=$? + if [ $primary_status -eq $HANA_STATE_PRIMARY ]; then ++ saphana_check_local_instance + saphana_monitor_primary; rc=$? + elif [ $primary_status -eq $HANA_STATE_SECONDARY ]; then ++ saphana_check_local_instance + saphana_monitor_secondary; rc=$? + else + # diff --git a/SOURCES/bz1834800-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch b/SOURCES/bz1834800-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch new file mode 100644 index 0000000..544d905 --- /dev/null +++ b/SOURCES/bz1834800-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch @@ -0,0 +1,38 @@ +From 42d6ce2143f4439fed8c8b31e03dde655f1bbadb Mon Sep 17 00:00:00 2001 +From: Frank Danapfel +Date: Tue, 21 Apr 2020 14:11:36 +0200 +Subject: [PATCH] Allow nodenames with dashes and/or underscores in lsn + function + +--- + sap_cluster_connector-f3644f5/redhat/sap_cluster_connector | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/sap_cluster_connector-f3644f5/sap_cluster_connector-f3644f5/redhat/sap_cluster_connector b/redhat/sap_cluster_connector +index a88b27a..6250887 100755 +--- a/sap_cluster_connector-f3644f5/redhat/sap_cluster_connector ++++ b/sap_cluster_connector-f3644f5/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 () { + 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); diff --git a/SPECS/resource-agents.spec b/SPECS/resource-agents.spec index 5c80068..417140d 100644 --- a/SPECS/resource-agents.spec +++ b/SPECS/resource-agents.spec @@ -95,7 +95,7 @@ Name: resource-agents Summary: Open Source HA Reusable Cluster Resource Scripts Version: 4.1.1 -Release: 46%{?dist}.1 +Release: 46%{?dist}.2 License: GPLv2+ and LGPLv2+ and ASL 2.0 URL: https://github.com/ClusterLabs/resource-agents %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} @@ -197,6 +197,11 @@ Patch76: bz1582685-IPsrcaddr-4-fix-hardcoded-device.patch Patch77: bz1803801-exportfs-allow-same-fsid.patch Patch78: bz1803799-rabbitmq-cluster-delete-nodename-when-stop-fails.patch Patch79: bz1803025-oralsnr-allow-using-same-tns_admin.patch +Patch80: bz1834800-sap-cluster-connector-allow-dashes-underscores-in-nodenames.patch +Patch81: bz1834796-sap-hana-scaleout-1-timeouts-recommendations.patch +Patch82: bz1834796-sap-hana-scaleout-2-timeouts-recommendations.patch +Patch83: bz1834796-sap-hana-scaleout-3-fixes.patch +Patch84: bz1834796-sap-hana-scaleout-4-sapstartsrv-fix.patch # bundle patches Patch1000: bz1568588-7-gcp-bundled.patch @@ -390,8 +395,8 @@ SAP instances to be managed in a cluster environment. %package sap-hana-scaleout License: GPLv2+ Summary: SAP HANA Scale-Out cluster resource agents -Version: 0.163.2 -Release: 22%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 +Version: 0.164.0 +Release: 1%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} Group: System Environment/Base %else @@ -411,7 +416,7 @@ environment. License: GPLv2+ Summary: SAP cluster connector script Version: 3.0.1 -Release: 22%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.1 +Release: 22%{?rcver:%{rcver}}%{?numcomm:.%{numcomm}}%{?alphatag:.%{alphatag}}%{?dirty:.%{dirty}}%{?dist}.2 %if 0%{?fedora} || 0%{?centos_version} || 0%{?rhel} Group: System Environment/Base %else @@ -515,6 +520,11 @@ exit 1 %patch77 -p1 %patch78 -p1 %patch79 -p1 -F1 +%patch80 -p1 +%patch81 -p1 +%patch82 -p1 +%patch83 -p1 +%patch84 -p1 # add SAPHana agents to Makefile.am mv %{saphana_prefix}-%{saphana_version}/ra/SAPHana* heartbeat @@ -1155,6 +1165,14 @@ ccs_update_schema > /dev/null 2>&1 ||: %endif %changelog +* Tue May 12 2020 Oyvind Albrigtsen - 4.1.1-46.2 +- sap-cluster-connector: allow dashes/underscores in nodenames +- sap-hana-scaleout: set default timeouts based on recommendations + and a couple of bugfixes + + Resolves: rhbz#1834800 + Resolves: rhbz#1834796 + * Tue Feb 18 2020 Oyvind Albrigtsen - 4.1.1-46.1 - exportfs: allow multiple exports with same fsid - rabbitmq-cluster: delete nodename when stop fails