summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-03 12:51:12 +0000
committerGerrit Code Review <review@openstack.org>2017-05-03 12:51:12 +0000
commit34528808804ed3edd822f20ce141adae421b12b9 (patch)
tree0cc1f07c76c80a36c82d35f93aa4f783a698ee2b
parent9a0e52c5ba70f0b28f20806fc963a08a2b9de2b8 (diff)
parentc8373d4aea13b881bfbd17ff060516ca35055b49 (diff)
Merge "Fix race condition for primary component bootstrap"
-rwxr-xr-xfiles/fuel-ha-utils/ocf/mysql-wss13
1 files changed, 6 insertions, 7 deletions
diff --git a/files/fuel-ha-utils/ocf/mysql-wss b/files/fuel-ha-utils/ocf/mysql-wss
index be06079..77067ac 100755
--- a/files/fuel-ha-utils/ocf/mysql-wss
+++ b/files/fuel-ha-utils/ocf/mysql-wss
@@ -503,6 +503,7 @@ check_if_galera_pc() {
503 fi 503 fi
504 if [ ${pcnum} -gt 1 ]; then 504 if [ ${pcnum} -gt 1 ]; then
505 ocf_log err "${LH} But I'm running a new cluster, PID:${pid}, this is a split-brain!" 505 ocf_log err "${LH} But I'm running a new cluster, PID:${pid}, this is a split-brain!"
506 clear_node_pc
506 exit $OCF_ERR_GENERIC 507 exit $OCF_ERR_GENERIC
507 fi 508 fi
508 done 509 done
@@ -676,8 +677,6 @@ mysql_start() {
676 local rc 677 local rc
677 local dir 678 local dir
678 local mysql_extra_params 679 local mysql_extra_params
679 local set_pc=0
680
681 680
682 if mysql_status info 1; then 681 if mysql_status info 1; then
683 ocf_log info "${LH} MySQL already running" 682 ocf_log info "${LH} MySQL already running"
@@ -729,12 +728,13 @@ mysql_start() {
729 rc=$? 728 rc=$?
730 729
731 if [ $rc -eq 0 ]; then 730 if [ $rc -eq 0 ]; then
732 mysql_extra_params="$mysql_extra_params --wsrep-new-cluster" 731 mysql_extra_params="$mysql_extra_params --wsrep-new-cluster"
733 set_pc=1 732 update_node_pc
733 else
734 clear_node_pc
734 fi 735 fi
735 fi 736 fi
736 737
737 clear_node_pc
738 ocf_log info "${LH} Starting MySQL" 738 ocf_log info "${LH} Starting MySQL"
739 ${OCF_RESKEY_binary} \ 739 ${OCF_RESKEY_binary} \
740 --pid-file=$OCF_RESKEY_pid \ 740 --pid-file=$OCF_RESKEY_pid \
@@ -746,6 +746,7 @@ mysql_start() {
746 746
747 if [ $rc -ne 0 ]; then 747 if [ $rc -ne 0 ]; then
748 ocf_log err "${LH} MySQL start command failed: $rc" 748 ocf_log err "${LH} MySQL start command failed: $rc"
749 clear_node_pc
749 return $rc 750 return $rc
750 fi 751 fi
751 752
@@ -763,8 +764,6 @@ mysql_start() {
763 done 764 done
764 765
765 ocf_log info "${LH} MySQL started" 766 ocf_log info "${LH} MySQL started"
766 [ ${set_pc} -eq 1 ] && update_node_pc
767 [ $rc -ne $OCF_SUCCESS ] && update_node_gtid
768 return $OCF_SUCCESS 767 return $OCF_SUCCESS
769} 768}
770 769