From 10b94d052f7f0fd710af7da8a46270b7548efbdf Mon Sep 17 00:00:00 2001

From: Oyvind Albrigtsen <oalbrigt@redhat.com>

Date: Thu, 19 Mar 2020 10:55:35 +0100

Subject: [PATCH] redis: run validate-action during start

---

 heartbeat/redis.in | 4 ++++

 1 file changed, 4 insertions(+)

diff --git a/heartbeat/redis.in b/heartbeat/redis.in

index b030a8223..da7230a49 100755

--- a/heartbeat/redis.in

+++ b/heartbeat/redis.in

@@ -673,6 +673,10 @@

 	clientpasswd="$(sed -n -e  's/^\s*requirepass\s*\(.*\)\s*$/\1/p' < $REDIS_CONFIG | tail -n 1)"

 fi

+if [ "$__OCF_ACTION" = "start" ]; then

+	redis_validate || exit $?

+fi

+

 ocf_log debug "action=${1:-$__OCF_ACTION} notify_type=${OCF_RESKEY_CRM_meta_notify_type} notify_operation=${OCF_RESKEY_CRM_meta_notify_operation} master_host=${OCF_RESKEY_CRM_meta_notify_master_uname} slave_host=${OCF_RESKEY_CRM_meta_notify_slave_uname} promote_host=${OCF_RESKEY_CRM_meta_notify_promote_uname} demote_host=${OCF_RESKEY_CRM_meta_notify_demote_uname}; params: bin=${OCF_RESKEY_bin} client_bin=${OCF_RESKEY_client_bin} config=${OCF_RESKEY_config} user=${OCF_RESKEY_user} rundir=${OCF_RESKEY_rundir} port=${OCF_RESKEY_port}"

 case "${1:-$__OCF_ACTION}" in