andy/glusterfs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

common-ha: cluster HA setup sometimes fails

Browse Source 
the "s in the VIP_foo="x.x.x.x" lines are problematic now that the
config file isn't sourced.

Revised to also handle names containing '-', e.g. host-11, and FQNs,
e.g. host-11.lab.gluster.org

Change-Id: I1a52afbf398a024cdff851d0c415d8363f699c90
BUG: 1232001
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/11281
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Meghana M <mmadhusu@redhat.com>
Reviewed-by: soumya k <skoduri@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2015-06-17 10:48:03 -04:00 committed by Kaleb KEITHLEY
parent e9a681fb97
commit 26f17994a4
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
extras/ganesha/scripts/ganesha-ha.sh
View File

@ -343,10 +343,23 @@ setup_create_resources()
while [[ ${1} ]]; do
# this is variable indirection
# from a nvs like 'VIP_host1=10.7.6.5' or 'VIP_host1="10.7.6.5"'
# (or VIP_host-1=..., or VIP_host-1.my.domain.name=...)
# a variable 'clean_name' is created (e.g. w/ value 'VIP_host_1')
# and a clean nvs (e.g. w/ value 'VIP_host_1="10_7_6_5"')
# after the `eval ${clean_nvs}` there is a variable VIP_host_1
# with the value '10_7_6_5', and the following \$$ magic to
# reference it, i.e. `eval tmp_ipaddr=\$${clean_name}` gives us
# ${tmp_ipaddr} with 10_7_6_5 and then convert the _s back to .s
# to give us ipaddr="10.7.6.5". whew!
name="VIP_${1}"
clean_name=${name//[-.]/_}
nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf)
eval ${nvs}
eval ipaddr=\$$name
clean_nvs=${nvs//[-.]/_}
eval ${clean_nvs}
eval tmp_ipaddr=\$${clean_name}
ipaddr=${tmp_ipaddr//_/.}
pcs -f ${cibfile} resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=15s
if [ $? -ne 0 ]; then
@ -440,10 +453,15 @@ recreate_resources()
local cibfile=${1}; shift
while [[ ${1} ]]; do
# this is variable indirection
# see the comment on the same a few lines up
name="VIP_${1}"
clean_name=${name//[-.]/_}
nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf)
eval ${nvs}
eval ipaddr=\$$name
clean_nvs=${nvs//[-.]/_}
eval ${clean_nvs}
eval tmp_ipaddr=\$${clean_name}
ipaddr=${tmp_ipaddr//_/.}
pcs -f ${cibfile} resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=15s
if [ $? -ne 0 ]; then