From e9ffc36fef8e1a96601c9cdd2dc76e45f320e301 Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Sun, 15 May 2016 11:03:02 -0400 Subject: common-ha: floating IP (VIP) doesn't fail over when ganesha.nfsd dies restore mistaken removal of 'attrd_updater delete grace-active' to trigger fail-over original was: attrd_updater -D -n grace-active sleep attrd_updater -D -n ganesha-active mistake was: sleep attrd_updater -D -n grace-active Change-Id: Iabd06ed042671e1fa744c4db469cd33ff40d6c4e BUG: 1336199 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/14345 Smoke: Gluster Build System Reviewed-by: soumya k NetBSD-regression: NetBSD Build System CentOS-regression: Gluster Build System --- extras/ganesha/ocf/ganesha_mon | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'extras') diff --git a/extras/ganesha/ocf/ganesha_mon b/extras/ganesha/ocf/ganesha_mon index 65450b82209..dbb9eaaaccf 100644 --- a/extras/ganesha/ocf/ganesha_mon +++ b/extras/ganesha/ocf/ganesha_mon @@ -173,8 +173,6 @@ ganesha_mon_monitor() # the remaining ganesha.nfsds into grace before # initiating the VIP fail-over. - sleep ${OCF_RESKEY_grace_delay} - attrd_updater -D -n ${OCF_RESKEY_grace_active} if [ $? -ne 0 ]; then ocf_log info "warning: attrd_updater -D -n ${OCF_RESKEY_grace_active} failed" @@ -185,6 +183,13 @@ ganesha_mon_monitor() ocf_log info "warning: crm_attribute --node=${short_host} --name=${OCF_RESKEY_grace_active} --update=0 failed" fi + sleep ${OCF_RESKEY_grace_delay} + + attrd_updater -D -n ${OCF_RESKEY_ganesha_active} + if [ $? -ne 0 ]; then + ocf_log info "warning: attrd_updater -D -n ${OCF_RESKEY_ganesha_active} failed" + fi + return ${OCF_SUCCESS} } -- cgit