From 5a65416b14da7b06aff9319f39c5c4f4e7c884fb Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Tue, 20 Dec 2016 18:22:02 +0530 Subject: common-ha: Correct the VIP assigned to the new node added There is a regression introduced with patch#16115. An incorrect VIP gets assigned to the new node being added to the cluster. This patch fixes the same. This is backport of below mainline patch: http://review.gluster.org/16213 > Change-Id: I468c7d16bf7e4efa04692db83b1c5ee58fbb7d5f > BUG: 1406410 > Signed-off-by: Soumya Koduri Change-Id: Iccac83720280d823b36c1e47194b2e17226c91db BUG: 1408110 Signed-off-by: Soumya Koduri Reviewed-on: http://review.gluster.org/16269 Reviewed-by: jiffin tony Thottan Smoke: Gluster Build System Reviewed-by: Kaleb KEITHLEY NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- extras/ganesha/scripts/ganesha-ha.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'extras') diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index ecf0e9819da..bd8c8979e40 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -619,16 +619,16 @@ addnode_recreate_resources() recreate_resources ${cibfile} ${HA_SERVERS} pcs -f ${cibfile} resource create ${add_node}-nfs_block ocf:heartbeat:portblock \ - protocol=tcp portno=2049 action=block ip=${ipaddr} --group ${add_node}-group + protocol=tcp portno=2049 action=block ip=${add_vip} --group ${add_node}-group if [ $? -ne 0 ]; then logger "warning pcs resource create ${add_node}-nfs_block failed" fi pcs -f ${cibfile} resource create ${add_node}-cluster_ip-1 ocf:heartbeat:IPaddr \ - ip=${ipaddr} cidr_netmask=32 op monitor interval=15s --group ${add_node}-group \ + ip=${add_vip} cidr_netmask=32 op monitor interval=15s --group ${add_node}-group \ --after ${add_node}-nfs_block if [ $? -ne 0 ]; then logger "warning pcs resource create ${add_node}-cluster_ip-1 ocf:heartbeat:IPaddr \ - ip=${ipaddr} cidr_netmask=32 op monitor interval=15s failed" + ip=${add_vip} cidr_netmask=32 op monitor interval=15s failed" fi pcs -f ${cibfile} constraint order nfs-grace-clone then ${add_node}-cluster_ip-1 @@ -636,7 +636,7 @@ addnode_recreate_resources() logger "warning: pcs constraint order nfs-grace-clone then ${add_node}-cluster_ip-1 failed" fi pcs -f ${cibfile} resource create ${add_node}-nfs_unblock ocf:heartbeat:portblock \ - protocol=tcp portno=2049 action=unblock ip=${ipaddr} reset_local_on_unblock_stop=true \ + protocol=tcp portno=2049 action=unblock ip=${add_vip} reset_local_on_unblock_stop=true \ tickle_dir=${HA_VOL_MNT}/nfs-ganesha/tickle_dir/ --group ${add_node}-group --after \ ${add_node}-cluster_ip-1 op stop timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} op start \ timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} op monitor interval=10s \ -- cgit