Remove mysqld_safe from mysql-wss OCF

Pacemaker controls mysqld, thus we don't need mysqld_safe wrapper which
does the same. This should help to get statuses for OCF scripts on very
high loaded systems

Change-Id: I73649d60c3cc08cbe696c6bc97ee5aa0ad430908
Related-Bug: 1636841
Signed-off-by: Sergii Golovatiuk <sgolovatiuk@mirantis.com>
(cherry picked from commit 081f27670f)
This commit is contained in:
Sergii Golovatiuk 2016-11-21 10:18:06 +01:00
parent 84f109e243
commit dda74618cd
1 changed files with 3 additions and 3 deletions

View File

@ -25,7 +25,7 @@
#######################################################################
# Fill in some defaults if no values are specified
OCF_RESKEY_binary_default="/usr/bin/mysqld_safe"
OCF_RESKEY_binary_default="/usr/sbin/mysqld"
OCF_RESKEY_client_binary_default="/usr/bin/mysql"
OCF_RESKEY_config_default="/etc/mysql/my.cnf"
OCF_RESKEY_datadir_default="/var/lib/mysql"
@ -284,8 +284,8 @@ update_node_gtid() {
-e "SHOW STATUS LIKE 'wsrep_last_committed'" | awk '{print $NF}')
GTID="$CLUSTER_ID:$COMMIT_ID"
else
GTID=$(${OCF_RESKEY_binary} --wsrep-recover \
--log-error=/dev/stdout 2>&1 | grep -e 'Recovered position' -e 'wsrep_start_position' | grep -Eo "${UUID_REGEX}")
GTID=$(/usr/bin/mysqld_safe --wsrep-recover \
--user=${OCF_RESKEY_user} 2>&1 | grep -e 'Recovered position' -e 'wsrep_start_position' | grep -Eo "${UUID_REGEX}")
[ -z "${GTID}" ] && GTID=$(cat ${OCF_RESKEY_datadir}/grastate.dat \
| awk '/uuid/ { uuid = $NF} /seqno/ { seqno = $NF} END {print uuid":"seqno}')
fi