82f22cc405
- All agents: use grep -E/-F - Filesystem: dont report warnings when creating resource - storage-mon: fix daemon mode bug that caused delayed initial score Resolves: RHEL-72954, RHEL-75574, RHEL-76007, RHEL-76037
149 lines
3.8 KiB
Diff
149 lines
3.8 KiB
Diff
From b72b329a45c058fda720c6739f881b9597fc8b30 Mon Sep 17 00:00:00 2001
|
|
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
|
|
Date: Thu, 23 Jan 2025 16:18:20 +0100
|
|
Subject: [PATCH] storage-mon: replace dashes with underscores in functions
|
|
|
|
Dashes in function names produce "`storage-mon_usage': not a valid identifier"
|
|
error when run with sh -x.
|
|
---
|
|
heartbeat/storage-mon.in | 44 ++++++++++++++++++++--------------------
|
|
1 file changed, 22 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/heartbeat/storage-mon.in b/heartbeat/storage-mon.in
|
|
index 7c9943d4f..5edb96979 100644
|
|
--- a/heartbeat/storage-mon.in
|
|
+++ b/heartbeat/storage-mon.in
|
|
@@ -152,7 +152,7 @@ END
|
|
|
|
#######################################################################
|
|
|
|
-storage-mon_usage() {
|
|
+storage_mon_usage() {
|
|
cat <<END
|
|
usage: $0 {start|stop|monitor|validate-all|meta-data}
|
|
|
|
@@ -161,7 +161,7 @@ END
|
|
return $1
|
|
}
|
|
|
|
-storage-mon_init() {
|
|
+storage_mon_init() {
|
|
#Test for presence of storage_mon helper
|
|
if [ ! -x "$STORAGEMON" ] ; then
|
|
ocf_log err "${STORAGEMON} not installed."
|
|
@@ -205,7 +205,7 @@ storage-mon_init() {
|
|
fi
|
|
}
|
|
|
|
-storage-mon_update_attribute() {
|
|
+storage_mon_update_attribute() {
|
|
|
|
while :
|
|
do
|
|
@@ -224,9 +224,9 @@ storage-mon_update_attribute() {
|
|
return $OCF_SUCCESS
|
|
}
|
|
|
|
-storage-mon_monitor() {
|
|
+storage_mon_monitor() {
|
|
if ! ocf_is_true "$OCF_RESKEY_daemonize"; then
|
|
- storage-mon_init
|
|
+ storage_mon_init
|
|
|
|
# Monitor _MUST!_ differentiate correctly between running
|
|
# (SUCCESS), failed (ERROR) or _cleanly_ stopped (NOT RUNNING).
|
|
@@ -252,7 +252,7 @@ storage-mon_monitor() {
|
|
status="green"
|
|
fi
|
|
|
|
- storage-mon_update_attribute $status
|
|
+ storage_mon_update_attribute $status
|
|
return "$?"
|
|
else
|
|
ocf_pidfile_status "${PIDFILE}" > /dev/null 2>&1
|
|
@@ -298,20 +298,20 @@ storage-mon_monitor() {
|
|
esac
|
|
done
|
|
|
|
- storage-mon_update_attribute $status
|
|
+ storage_mon_update_attribute $status
|
|
return "$?"
|
|
fi
|
|
}
|
|
|
|
-storage-mon_start() {
|
|
+storage_mon_start() {
|
|
if ! ocf_is_true "$OCF_RESKEY_daemonize"; then
|
|
- storage-mon_monitor
|
|
+ storage_mon_monitor
|
|
if [ $? -eq $OCF_SUCCESS ]; then
|
|
return $OCF_SUCCESS
|
|
fi
|
|
touch "${OCF_RESKEY_state_file}"
|
|
else
|
|
- storage-mon_init
|
|
+ storage_mon_init
|
|
# generate command line
|
|
cmdline=""
|
|
for DRIVE in ${OCF_RESKEY_drives}; do
|
|
@@ -328,7 +328,7 @@ storage-mon_start() {
|
|
|
|
#Wait until monitor confirms the startup pid according to the ocf resource specification.
|
|
while true; do
|
|
- storage-mon_monitor pid_check_only
|
|
+ storage_mon_monitor pid_check_only
|
|
rc="$?"
|
|
if [ $rc -eq $OCF_SUCCESS ]; then
|
|
break
|
|
@@ -339,8 +339,8 @@ storage-mon_start() {
|
|
fi
|
|
}
|
|
|
|
-storage-mon_stop() {
|
|
- storage-mon_monitor
|
|
+storage_mon_stop() {
|
|
+ storage_mon_monitor
|
|
rc=$?
|
|
|
|
if ! ocf_is_true "$OCF_RESKEY_daemonize"; then
|
|
@@ -363,7 +363,7 @@ storage-mon_stop() {
|
|
fi
|
|
|
|
while true; do
|
|
- storage-mon_monitor pid_check_only
|
|
+ storage_mon_monitor pid_check_only
|
|
rc="$?"
|
|
case "$rc" in
|
|
$OCF_SUCCESS)
|
|
@@ -379,8 +379,8 @@ storage-mon_stop() {
|
|
return $OCF_SUCCESS
|
|
}
|
|
|
|
-storage-mon_validate() {
|
|
- storage-mon_init
|
|
+storage_mon_validate() {
|
|
+ storage_mon_init
|
|
|
|
if ! ocf_is_true "$OCF_RESKEY_daemonize"; then
|
|
# Is the state directory writable?
|
|
@@ -396,13 +396,13 @@ storage-mon_validate() {
|
|
}
|
|
|
|
case "$__OCF_ACTION" in
|
|
- start) storage-mon_start;;
|
|
- stop) storage-mon_stop;;
|
|
- monitor) storage-mon_monitor;;
|
|
- validate-all) storage-mon_validate;;
|
|
+ start) storage_mon_start;;
|
|
+ stop) storage_mon_stop;;
|
|
+ monitor) storage_mon_monitor;;
|
|
+ validate-all) storage_mon_validate;;
|
|
meta-data) meta_data;;
|
|
- usage|help) storage-mon_usage $OCF_SUCCESS;;
|
|
- *) storage-mon_usage $OCF_ERR_UNIMPLEMENTED;;
|
|
+ usage|help) storage_mon_usage $OCF_SUCCESS;;
|
|
+ *) storage_mon_usage $OCF_ERR_UNIMPLEMENTED;;
|
|
esac
|
|
rc=$?
|
|
ocf_log debug "${OCF_RESOURCE_INSTANCE} $__OCF_ACTION : $rc"
|