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.

(A short term work-around is to simply eliminate them.)

Change-Id: I65f375f2d3b8453adb45dc3dbbc7d3fb07cf85d0
BUG: 1232001
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/11237
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-15 15:29:41 -04:00 committed by Niels de Vos
parent 4a829e33d9
commit 1b9a2edf2c
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -343,11 +343,14 @@ setup_create_resources()
while [[ ${1} ]]; do
ipaddr=$(grep "^VIP_${1}=" ${HA_CONFDIR}/ganesha-ha.conf | cut -d = -f 2)
name="VIP_${1}"
nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf)
eval ${nvs}
eval ipaddr=\$$name
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
logger "warning pcs resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=10s failed"
logger "warning pcs resource create ${1}-cluster_ip-1 ocf:heartbeat:IPaddr ip=${ipaddr} cidr_netmask=32 op monitor interval=15s failed"
fi
pcs -f ${cibfile} resource create ${1}-trigger_ip-1 ocf:heartbeat:Dummy
@ -437,7 +440,10 @@ recreate_resources()
local cibfile=${1}; shift
while [[ ${1} ]]; do
ipaddr=$(grep "VIP_${1}=" ${HA_CONFDIR}/ganesha-ha.conf | cut -d = -f 2)
name="VIP_${1}"
nvs=$(grep "^${name}=" ${HA_CONFDIR}/ganesha-ha.conf)
eval ${nvs}
eval ipaddr=\$$name
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
@ -761,7 +767,6 @@ main()
teardown_resources ${HA_SERVERS}
teardown_cluster ${HA_NAME}
;;
cleanup | --cleanup)