|
 |
c98ed0 |
From 70a28e8130be863a9073b0a80e0511e971e205c4 Mon Sep 17 00:00:00 2001
|
|
|
c98ed0 |
From: Fabian Herschel <fabian.herschel@suse.com>
|
|
|
c98ed0 |
Date: Fri, 27 Jul 2018 12:33:19 +0200
|
|
|
c98ed0 |
Subject: [PATCH 1/2] SAPInstance: implemeted reload method The reload method
|
|
|
c98ed0 |
is needed to avoid resource restarts after a non-unique parameter has been
|
|
|
c98ed0 |
changed. This is in special for interest of the MONITOR_SERVICES parameter.
|
|
|
c98ed0 |
|
|
|
c98ed0 |
---
|
|
|
c98ed0 |
heartbeat/SAPInstance | 6 ++++++
|
|
|
c98ed0 |
1 file changed, 6 insertions(+)
|
|
|
c98ed0 |
|
|
|
c98ed0 |
diff --git a/heartbeat/SAPInstance b/heartbeat/SAPInstance
|
|
|
c98ed0 |
index 8de7cee8c..c25839f0c 100755
|
|
|
c98ed0 |
--- a/heartbeat/SAPInstance
|
|
|
c98ed0 |
+++ b/heartbeat/SAPInstance
|
|
|
c98ed0 |
@@ -61,6 +61,7 @@ sapinstance_usage() {
|
|
|
c98ed0 |
The 'monitor' operation reports whether the instance seems to be working
|
|
|
c98ed0 |
The 'promote' operation starts the primary instance in a Master/Slave configuration
|
|
|
c98ed0 |
The 'demote' operation stops the primary instance and starts the ERS instance
|
|
|
c98ed0 |
+ The 'reload' operation allows changed parameters (non-unique only) without restarting the service
|
|
|
c98ed0 |
The 'notify' operation always returns SUCCESS
|
|
|
c98ed0 |
The 'validate-all' operation reports whether the parameters are valid
|
|
|
c98ed0 |
The 'methods' operation reports on the methods $0 supports
|
|
|
c98ed0 |
@@ -224,6 +225,7 @@ The name of the SAP START profile. Specify this parameter, if you have changed t
|
|
|
c98ed0 |
<action name="monitor" depth="0" timeout="60s" interval="119s" role="Master" />
|
|
|
c98ed0 |
<action name="promote" timeout="320s" />
|
|
|
c98ed0 |
<action name="demote" timeout="320s" />
|
|
|
c98ed0 |
+<action name="reload" timeout="320" />
|
|
|
c98ed0 |
<action name="validate-all" timeout="5s" />
|
|
|
c98ed0 |
<action name="meta-data" timeout="5s" />
|
|
|
c98ed0 |
<action name="methods" timeout="5s" />
|
|
|
c98ed0 |
@@ -244,6 +246,7 @@ sapinstance_methods() {
|
|
|
c98ed0 |
monitor
|
|
|
c98ed0 |
promote
|
|
|
c98ed0 |
demote
|
|
|
c98ed0 |
+ reload
|
|
|
c98ed0 |
notify
|
|
|
c98ed0 |
validate-all
|
|
|
c98ed0 |
methods
|
|
|
c98ed0 |
@@ -965,6 +968,9 @@ case "$ACTION" in
|
|
|
c98ed0 |
exit $?;;
|
|
|
c98ed0 |
validate-all) sapinstance_validate
|
|
|
c98ed0 |
exit $?;;
|
|
|
c98ed0 |
+ reload )
|
|
|
c98ed0 |
+ ocf_log info "reloading SAPInstance parameters"
|
|
|
c98ed0 |
+ exit $OCF_SUCCESS;;
|
|
|
c98ed0 |
*) sapinstance_methods
|
|
|
c98ed0 |
exit $OCF_ERR_UNIMPLEMENTED;;
|
|
|
c98ed0 |
esac
|
|
|
c98ed0 |
|
|
|
c98ed0 |
From ee529b088cc1111656e94dea56b9fcfa6d813313 Mon Sep 17 00:00:00 2001
|
|
|
c98ed0 |
From: Fabian Herschel <fabian.herschel@suse.com>
|
|
|
c98ed0 |
Date: Fri, 27 Jul 2018 13:02:39 +0200
|
|
|
c98ed0 |
Subject: [PATCH 2/2] SAPInstance: Improved indents
|
|
|
c98ed0 |
|
|
|
c98ed0 |
---
|
|
|
c98ed0 |
heartbeat/SAPInstance | 8 ++++----
|
|
|
c98ed0 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
c98ed0 |
|
|
|
c98ed0 |
diff --git a/heartbeat/SAPInstance b/heartbeat/SAPInstance
|
|
|
c98ed0 |
index c25839f0c..174ea36ef 100755
|
|
|
c98ed0 |
--- a/heartbeat/SAPInstance
|
|
|
c98ed0 |
+++ b/heartbeat/SAPInstance
|
|
|
c98ed0 |
@@ -61,7 +61,7 @@ sapinstance_usage() {
|
|
|
c98ed0 |
The 'monitor' operation reports whether the instance seems to be working
|
|
|
c98ed0 |
The 'promote' operation starts the primary instance in a Master/Slave configuration
|
|
|
c98ed0 |
The 'demote' operation stops the primary instance and starts the ERS instance
|
|
|
c98ed0 |
- The 'reload' operation allows changed parameters (non-unique only) without restarting the service
|
|
|
c98ed0 |
+ The 'reload' operation allows changed parameters (non-unique only) without restarting the service
|
|
|
c98ed0 |
The 'notify' operation always returns SUCCESS
|
|
|
c98ed0 |
The 'validate-all' operation reports whether the parameters are valid
|
|
|
c98ed0 |
The 'methods' operation reports on the methods $0 supports
|
|
|
c98ed0 |
@@ -246,7 +246,7 @@ sapinstance_methods() {
|
|
|
c98ed0 |
monitor
|
|
|
c98ed0 |
promote
|
|
|
c98ed0 |
demote
|
|
|
c98ed0 |
- reload
|
|
|
c98ed0 |
+ reload
|
|
|
c98ed0 |
notify
|
|
|
c98ed0 |
validate-all
|
|
|
c98ed0 |
methods
|
|
|
c98ed0 |
@@ -969,8 +969,8 @@ case "$ACTION" in
|
|
|
c98ed0 |
validate-all) sapinstance_validate
|
|
|
c98ed0 |
exit $?;;
|
|
|
c98ed0 |
reload )
|
|
|
c98ed0 |
- ocf_log info "reloading SAPInstance parameters"
|
|
|
c98ed0 |
- exit $OCF_SUCCESS;;
|
|
|
c98ed0 |
+ ocf_log info "reloading SAPInstance parameters"
|
|
|
c98ed0 |
+ exit $OCF_SUCCESS;;
|
|
|
c98ed0 |
*) sapinstance_methods
|
|
|
c98ed0 |
exit $OCF_ERR_UNIMPLEMENTED;;
|
|
|
c98ed0 |
esac
|