|
 |
3604df |
From 29365c5ab3681fd954423ef8f081bd7b11934621 Mon Sep 17 00:00:00 2001
|
|
|
3604df |
From: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Date: Tue, 20 Dec 2016 18:22:02 +0530
|
|
|
3604df |
Subject: [PATCH 254/257] common-ha: Correct the VIP assigned to the new node
|
|
|
3604df |
added
|
|
|
3604df |
|
|
|
3604df |
There is a regression introduced with patch#16115. An incorrect
|
|
|
3604df |
VIP gets assigned to the new node being added to the cluster.
|
|
|
3604df |
This patch fixes the same.
|
|
|
3604df |
|
|
|
3604df |
This is backport of below upstream patches
|
|
|
3604df |
http://review.gluster.org/#/c/16213 (mainline)
|
|
|
3604df |
http://review.gluster.org/#/c/16269/ (release-3.9)
|
|
|
3604df |
|
|
|
3604df |
>Change-Id: I468c7d16bf7e4efa04692db83b1c5ee58fbb7d5f
|
|
|
3604df |
BUG: 1406401
|
|
|
3604df |
Signed-off-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
|
|
|
3604df |
Change-Id: Ie751e9832468056f60c93002949488eda274ad30
|
|
|
3604df |
Reviewed-on: https://code.engineering.redhat.com/gerrit/93569
|
|
|
3604df |
Tested-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
3604df |
Reviewed-by: Jiffin Thottan <jthottan@redhat.com>
|
|
|
3604df |
Reviewed-by: Atin Mukherjee <amukherj@redhat.com>
|
|
|
3604df |
---
|
|
|
3604df |
extras/ganesha/scripts/ganesha-ha.sh | 8 ++++----
|
|
|
3604df |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
3604df |
|
|
|
3604df |
diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
3604df |
index 2a653c9..0388316 100644
|
|
|
3604df |
--- a/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
3604df |
+++ b/extras/ganesha/scripts/ganesha-ha.sh
|
|
|
3604df |
@@ -619,16 +619,16 @@ addnode_recreate_resources()
|
|
|
3604df |
recreate_resources ${cibfile} ${HA_SERVERS}
|
|
|
3604df |
|
|
|
3604df |
pcs -f ${cibfile} resource create ${add_node}-nfs_block ocf:heartbeat:portblock \
|
|
|
3604df |
- protocol=tcp portno=2049 action=block ip=${ipaddr} --group ${add_node}-group
|
|
|
3604df |
+ protocol=tcp portno=2049 action=block ip=${add_vip} --group ${add_node}-group
|
|
|
3604df |
if [ $? -ne 0 ]; then
|
|
|
3604df |
logger "warning pcs resource create ${add_node}-nfs_block failed"
|
|
|
3604df |
fi
|
|
|
3604df |
pcs -f ${cibfile} resource create ${add_node}-cluster_ip-1 ocf:heartbeat:IPaddr \
|
|
|
3604df |
- ip=${ipaddr} cidr_netmask=32 op monitor interval=15s --group ${add_node}-group \
|
|
|
3604df |
+ ip=${add_vip} cidr_netmask=32 op monitor interval=15s --group ${add_node}-group \
|
|
|
3604df |
--after ${add_node}-nfs_block
|
|
|
3604df |
if [ $? -ne 0 ]; then
|
|
|
3604df |
logger "warning pcs resource create ${add_node}-cluster_ip-1 ocf:heartbeat:IPaddr \
|
|
|
3604df |
- ip=${ipaddr} cidr_netmask=32 op monitor interval=15s failed"
|
|
|
3604df |
+ ip=${add_vip} cidr_netmask=32 op monitor interval=15s failed"
|
|
|
3604df |
fi
|
|
|
3604df |
|
|
|
3604df |
pcs -f ${cibfile} constraint order nfs-grace-clone then ${add_node}-cluster_ip-1
|
|
|
3604df |
@@ -636,7 +636,7 @@ addnode_recreate_resources()
|
|
|
3604df |
logger "warning: pcs constraint order nfs-grace-clone then ${add_node}-cluster_ip-1 failed"
|
|
|
3604df |
fi
|
|
|
3604df |
pcs -f ${cibfile} resource create ${add_node}-nfs_unblock ocf:heartbeat:portblock \
|
|
|
3604df |
- protocol=tcp portno=2049 action=unblock ip=${ipaddr} reset_local_on_unblock_stop=true \
|
|
|
3604df |
+ protocol=tcp portno=2049 action=unblock ip=${add_vip} reset_local_on_unblock_stop=true \
|
|
|
3604df |
tickle_dir=${HA_VOL_MNT}/nfs-ganesha/tickle_dir/ --group ${add_node}-group --after \
|
|
|
3604df |
${add_node}-cluster_ip-1 op stop timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} op start \
|
|
|
3604df |
timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} op monitor interval=10s \
|
|
|
3604df |
--
|
|
|
3604df |
2.9.3
|
|
|
3604df |
|