|
 |
d1739a |
From d43d8af650ee9ed175ebd4fdfc15ac2767734a8d Mon Sep 17 00:00:00 2001
|
|
|
d1739a |
From: Fabian Herschel <fabian.herschel@suse.com>
|
|
|
d1739a |
Date: Wed, 25 Jul 2018 12:30:32 +0200
|
|
|
d1739a |
Subject: [PATCH] ra/SAPHanaTopology: bsc#1016691 "SAPHanaSR: Status file of
|
|
|
d1739a |
SAPHanaTopology is not multi instance aware (MCOS)"
|
|
|
d1739a |
|
|
|
d1739a |
---
|
|
|
d1739a |
SAPHana/ra/SAPHanaTopology | 20 +++++++++++---------
|
|
|
d1739a |
1 file changed, 11 insertions(+), 9 deletions(-)
|
|
|
d1739a |
|
|
|
d1739a |
diff --git a/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology b/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology
|
|
|
d1739a |
index 1e2f301..20d2593 100755
|
|
|
d1739a |
--- a/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology
|
|
|
d1739a |
+++ b/SAPHanaSR-2067519/SAPHana/ra/SAPHanaTopology
|
|
|
d1739a |
@@ -28,7 +28,7 @@
|
|
|
d1739a |
#######################################################################
|
|
|
d1739a |
#
|
|
|
d1739a |
# Initialization:
|
|
|
d1739a |
-SAPHanaVersion="0.152.21"
|
|
|
d1739a |
+SAPHanaVersion="0.152.22"
|
|
|
d1739a |
timeB=$(date '+%s')
|
|
|
d1739a |
|
|
|
d1739a |
: ${OCF_FUNCTIONS_DIR=${OCF_ROOT}/lib/heartbeat}
|
|
|
d1739a |
@@ -736,15 +736,17 @@ function sht_start() {
|
|
|
d1739a |
# sht_stop: Stop the SAP HANA Topology Resource
|
|
|
d1739a |
#
|
|
|
d1739a |
function sht_stop() {
|
|
|
d1739a |
- super_ocf_log info "FLOW $FUNCNAME ($*)"
|
|
|
d1739a |
- local output=""
|
|
|
d1739a |
- local rc=0
|
|
|
d1739a |
-
|
|
|
d1739a |
- rm $HA_RSCTMP/SAPHana/SAPTopologyON.${SID}
|
|
|
d1739a |
- rc=$OCF_SUCCESS
|
|
|
d1739a |
+ super_ocf_log info "FLOW $FUNCNAME ($*)"
|
|
|
d1739a |
+ local output=""
|
|
|
d1739a |
+ local rc=0
|
|
|
d1739a |
+ if [ -f $HA_RSCTMP/SAPHana/SAPTopologyON ]; then
|
|
|
d1739a |
+ rm $HA_RSCTMP/SAPHana/SAPTopologyON
|
|
|
d1739a |
+ fi
|
|
|
d1739a |
+ rm $HA_RSCTMP/SAPHana/SAPTopologyON.${SID}
|
|
|
d1739a |
+ rc=$OCF_SUCCESS
|
|
|
d1739a |
|
|
|
d1739a |
- super_ocf_log info "FLOW $FUNCNAME rc=$rc"
|
|
|
d1739a |
- return $rc
|
|
|
d1739a |
+ super_ocf_log info "FLOW $FUNCNAME rc=$rc"
|
|
|
d1739a |
+ return $rc
|
|
|
d1739a |
}
|
|
|
d1739a |
|
|
|
d1739a |
|