Merge pull request #29 from angelabriel/master

sapstartsrv service on master_nameserver node not restarted when bein…
SUSE · Nov 21, 2019 · 4dc0a3c · 4dc0a3c
2 parents b14b210 + afec25c
commit 4dc0a3c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 2 deletions.
diff --git a/SAPHanaSR.changes_12 b/SAPHanaSR.changes_12
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 21 12:50:07 UTC 2019 - [email protected]
+
+- restart sapstartsrv service on master nameserver node during
+  monitor action, if needed. But NOT during probes.
+  (bsc#1157453)
+
 -------------------------------------------------------------------
 Fri Nov 15 12:16:38 UTC 2019 - [email protected]
 

diff --git a/SAPHanaSR.changes_15 b/SAPHanaSR.changes_15
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 21 12:50:07 UTC 2019 - [email protected]
+
+- restart sapstartsrv service on master nameserver node during
+  monitor action, if needed. But NOT during probes.
+  (bsc#1157453)
+
 -------------------------------------------------------------------
 Fri Nov 15 12:16:38 UTC 2019 - [email protected]
 

diff --git a/ra/SAPHana b/ra/SAPHana
@@ -2461,12 +2461,15 @@ function saphana_monitor_clone() {
             elif [ $myMaster -eq -1 ]; then
                set_crm_master 5
             fi
+        else
+            saphana_check_local_instance
         fi
-        saphana_check_local_instance
         saphana_monitor_primary; rc=$?
     else
         if [ $primary_status -eq $HANA_STATE_SECONDARY  ]; then
-            saphana_check_local_instance
+            if ! ocf_is_probe; then
+                saphana_check_local_instance
+            fi
             saphana_monitor_secondary; rc=$?
         else
             #