# HG changeset patch
# User Marian Marinov <[email protected]>
# Date 1267453055 -7200
# Branch mysql-ms
# Node ID be4026374c679d0b873c39c30dcdc9eca89cd920
# Parent dc0dad7b935739987478e876d431e068f7ca1373
Low: RA: mysql: cleaned more bashisms
Changed the shell back to /bin/sh
Changed all == comparations to =
diff -r dc0dad7b9357 -r be4026374c67 heartbeat/mysql
--- a/heartbeat/mysql Fri Feb 26 16:55:51 2010 +0200
+++ b/heartbeat/mysql Mon Mar 01 16:17:35 2010 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
#
# MySQL
@@ -335,11 +335,11 @@
mysql \
--socket=$OCF_RESKEY_socket -O connect_timeout=1 \
-e 'SHOW SLAVE STATUS\G'|awk '/Running/ || /Master_[UHP]/{print
$2}'|while read k v; do
- if [ "$a" == 'Master_Host:' ]; then master_host="$v"; fi
- if [ "$a" == 'Master_User:' ]; then master_user="$v"; fi
- if [ "$a" == 'Master_Port:' ]; then master_port="$v"; fi
- if [ "$a" == 'Slave_IO_Running:' ]; then slave_io="$v"; fi
- if [ "$a" == 'Slave_SQL_Running:' ]; then slave_sql="$v"; fi
+ if [ "$a" = 'Master_Host:' ]; then master_host="$v"; fi
+ if [ "$a" = 'Master_User:' ]; then master_user="$v"; fi
+ if [ "$a" = 'Master_Port:' ]; then master_port="$v"; fi
+ if [ "$a" = 'Slave_IO_Running:' ]; then slave_io="$v"; fi
+ if [ "$a" = 'Slave_SQL_Running:' ]; then slave_sql="$v"; fi
done
if [ -z "$master_host" ] || [ -z "$master_user" ] || [ -z "$master_port" ]
|| [ -z "$slave_io" ] || [ -z "$slave_sql" ]; then
@@ -347,16 +347,16 @@
return 1
fi
- if [ $# == 1 ]; then
- if [ "$slave_io" == 'Yes' ] &&
- [ "$slave_sql" == 'Yes' ] &&
- [ "$master_user" == "$OCF_RESKEY_replication_user" ];
then
+ if [ $# = 1 ]; then
+ if [ "$slave_io" = 'Yes' ] &&
+ [ "$slave_sql" = 'Yes' ] &&
+ [ "$master_user" = "$OCF_RESKEY_replication_user" ];
then
# machine is slave
return 0;
fi
else
- if [ "$slave_io" == 'Yes' ] || [ "$slave_sql" == 'Yes' ]; then
- if [ "$slave_user" == "$OCF_RESKEY_replication_user" ];
then
+ if [ "$slave_io" = 'Yes' ] || [ "$slave_sql" = 'Yes' ]; then
+ if [ "$slave_user" = "$OCF_RESKEY_replication_user" ];
then
# machine is slave
return 0;
fi
@@ -399,17 +399,17 @@
return $OCF_RUNNING_MASTER;
fi
# if the check requires a master/slave status and this is the
Master node
- if [ "$OCF_RESKEY_CRM_meta_role" == "Master" ]; then
+ if [ "$OCF_RESKEY_CRM_meta_role" = "Master" ]; then
return $OCF_RUNNING_MASTER
fi
fi
- if [ $OCF_CHECK_LEVEL == 0 ]; then
+ if [ $OCF_CHECK_LEVEL = 0 ]; then
return $rc
fi
if ocf_is_ms &&
- [ "$OCF_RESKEY_CRM_meta_role" == "Slave" ] &&
+ [ "$OCF_RESKEY_CRM_meta_role" = "Slave" ] &&
is_slave 1; then
return $OCF_SUCCESS
fi
@@ -573,13 +573,13 @@
ocf_log err "unable to demote (No master or promote uname
found)"
return $OCF_ERR_GENERIC
fi
- if [ "$OCF_RESKEY_CRM_meta_notify_promote_uname" == "$HOSTNAME " ]; then
+ if [ "$OCF_RESKEY_CRM_meta_notify_promote_uname" = "$HOSTNAME " ]; then
ocf_log err "should not try to connect to my self(promote)"
return $OCF_ERR_GENERIC
else
master_host=$OCF_RESKEY_CRM_meta_notify_promote_uname
fi
- if [ "$OCF_RESKEY_CRM_meta_notify_master_uname" == "$HOSTNAME " ]; then
+ if [ "$OCF_RESKEY_CRM_meta_notify_master_uname" = "$HOSTNAME " ]; then
ocf_log err "should not try to connect to my self(master)"
return $OCF_ERR_GENERIC
else
@@ -604,8 +604,8 @@
-h $master_host \
-O connect_timeout=1 \
-e 'SHOW MASTER STATUS\G'|while read k v; do
- if [ "$k" == 'File:' ]; then master_file="$v"; fi
- if [ "$k" == 'Position:' ]; then master_pos="$v"; fi
+ if [ "$k" = 'File:' ]; then master_file="$v"; fi
+ if [ "$k" = 'Position:' ]; then master_pos="$v"; fi
done
if [ -z "$master_file" ] || [ -z "$master_pos" ]; then
@@ -643,7 +643,7 @@
fi
;;
'demote')
- if [ "$OCF_RESKEY_CRM_meta_notify_promote_uname" ==
"$HOSTNAME " ] &&
+ if [ "$OCF_RESKEY_CRM_meta_notify_promote_uname" =
"$HOSTNAME " ] &&
! is_slave 1; then
mysql_demote 1
fi
_______________________________________________________
Linux-HA-Dev: [email protected]
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/
