|
 |
b4da46 |
diff --git a/heartbeat/galera b/heartbeat/galera
|
|
|
b4da46 |
index 6d8cf12..a3e5c90 100644
|
|
|
b4da46 |
--- a/heartbeat/galera
|
|
|
b4da46 |
+++ b/heartbeat/galera
|
|
|
b4da46 |
@@ -79,7 +79,7 @@ fi
|
|
|
b4da46 |
|
|
|
b4da46 |
usage() {
|
|
|
b4da46 |
cat <
|
|
|
b4da46 |
-usage: $0 (start|stop|validate-all|meta-data|monitor|promote|demote|notify)
|
|
|
b4da46 |
+usage: $0 (start|stop|validate-all|meta-data|monitor|promote|demote)
|
|
|
b4da46 |
|
|
|
b4da46 |
$0 manages a galera Database as an HA resource.
|
|
|
b4da46 |
|
|
|
b4da46 |
@@ -235,9 +235,8 @@ Cluster check user password
|
|
|
b4da46 |
<action name="monitor" depth="0" timeout="30" interval="20" />
|
|
|
b4da46 |
<action name="monitor" role="Master" depth="0" timeout="30" interval="10" />
|
|
|
b4da46 |
<action name="monitor" role="Slave" depth="0" timeout="30" interval="30" />
|
|
|
b4da46 |
-<action name="promote" timeout="120" />
|
|
|
b4da46 |
+<action name="promote" timeout="300" />
|
|
|
b4da46 |
<action name="demote" timeout="120" />
|
|
|
b4da46 |
-<action name="notify" timeout="90" />
|
|
|
b4da46 |
<action name="validate-all" timeout="5" />
|
|
|
b4da46 |
<action name="meta-data" timeout="5" />
|
|
|
b4da46 |
</actions>
|
|
|
b4da46 |
@@ -532,7 +531,7 @@ galera_start()
|
|
|
b4da46 |
|
|
|
b4da46 |
is_readonly
|
|
|
b4da46 |
if [ $? -ne 0 ]; then
|
|
|
b4da46 |
- ocf_log err "Failure. Slave instance did not start correctly in read-only mode, Make sure local galera.cnf does not have wsrep_cluster_address set."
|
|
|
b4da46 |
+ ocf_log err "Slave instance did not start correctly in read-only mode, Make sure local galera.cnf does not have wsrep_cluster_address set."
|
|
|
b4da46 |
return $OCF_ERR_GENERIC
|
|
|
b4da46 |
fi
|
|
|
b4da46 |
|
|
|
b4da46 |
@@ -672,7 +671,7 @@ fi
|
|
|
b4da46 |
|
|
|
b4da46 |
MYSQL_OPTIONS_CHECK="-nNE --user=${OCF_RESKEY_check_user}"
|
|
|
b4da46 |
if [ -n "${OCF_RESKEY_check_passwd}" ]; then
|
|
|
b4da46 |
- MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=${MYSQL_PASSWORD}"
|
|
|
b4da46 |
+ MYSQL_OPTIONS_CHECK="$MYSQL_OPTIONS_CHECK --password=${OCF_RESKEY_check_passwd}"
|
|
|
b4da46 |
fi
|
|
|
b4da46 |
|
|
|
b4da46 |
# What kind of method was invoked?
|
|
|
b4da46 |
@@ -683,7 +682,6 @@ case "$1" in
|
|
|
b4da46 |
monitor) galera_monitor;;
|
|
|
b4da46 |
promote) galera_promote;;
|
|
|
b4da46 |
demote) galera_demote;;
|
|
|
b4da46 |
- notify) galera_notify;;
|
|
|
b4da46 |
validate-all) exit $OCF_SUCCESS;;
|
|
|
b4da46 |
|
|
|
b4da46 |
*) usage
|