From 600160015e965ea67f716e1a332fbd92b855807c Mon Sep 17 00:00:00 2001
From: AngelaBriel <abriel@suse.com>
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')