From e777c70b061c182460285948cb198b41a4102318 Mon Sep 17 00:00:00 2001 From: Soumya Koduri Date: Mon, 28 Nov 2016 17:56:35 +0530 Subject: [PATCH 210/227] common-HA: Increase timeout for portblock RA of action=unblock Portblock RA of action type unblock stores the information about the client/server IPs connection in tickle_dir folder created in the shared storage. In case of node shutdown/reboot there could be cases wherein shared_storage may become unavailable for sometime. Hence increase the timeout to avoid that resource agent going into FAILED state. This is backport of below upstream mainline patch - http://review.gluster.org/15947 release-3.9: http://review.gluster.org/#/c/15994/ >Change-Id: I4f98f819895cb164c3a82ba8084c7c11610f35ff >BUG: 1399154 >Signed-off-by: Soumya Koduri >Reviewed-on: http://review.gluster.org/15947 >Smoke: Gluster Build System >CentOS-regression: Gluster Build System >Reviewed-by: Kaleb KEITHLEY >Reviewed-by: Niels de Vos >NetBSD-regression: NetBSD Build System >Reviewed-by: jiffin tony Thottan BUG: 1398261 Change-Id: I4f863972bc5dd02e13c66966bae484628dce955a Signed-off-by: Soumya Koduri Reviewed-on: https://code.engineering.redhat.com/gerrit/91871 Reviewed-by: Atin Mukherjee --- extras/ganesha/scripts/ganesha-ha.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/extras/ganesha/scripts/ganesha-ha.sh b/extras/ganesha/scripts/ganesha-ha.sh index 5bdc893..7d024da 100644 --- a/extras/ganesha/scripts/ganesha-ha.sh +++ b/extras/ganesha/scripts/ganesha-ha.sh @@ -30,6 +30,10 @@ SERVICE_MAN="DISTRO_NOT_FOUND" RHEL6_PCS_CNAME_OPTION="--name" SECRET_PEM="/var/lib/glusterd/nfs/secret.pem" +# UNBLOCK RA uses shared_storage which may become unavailable +# during any of the nodes reboot. Hence increase timeout value. +PORTBLOCK_UNBLOCK_TIMEOUT="60s" + # Try loading the config from any of the distro # specific configuration locations if [ -f /etc/sysconfig/ganesha ] @@ -501,7 +505,9 @@ setup_create_resources() pcs -f ${cibfile} resource create ${1}-nfs_unblock ocf:heartbeat:portblock protocol=tcp \ portno=2049 action=unblock ip=${ipaddr} reset_local_on_unblock_stop=true \ - tickle_dir=${HA_VOL_MNT}/nfs-ganesha/tickle_dir/ --group ${1}-group --after ${1}-cluster_ip-1 + tickle_dir=${HA_VOL_MNT}/nfs-ganesha/tickle_dir/ --group ${1}-group --after ${1}-cluster_ip-1 \ + op stop timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} op start timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} \ + op monitor interval=10s timeout=${PORTBLOCK_UNBLOCK_TIMEOUT} if [ $? -ne 0 ]; then logger "warning pcs resource create ${1}-nfs_unblock failed" fi -- 2.9.3