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