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: Ifb20ebc673b8d262dfb720e7d5c060fbf0d1639b
BUG: 1336197
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14343
Smoke: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: soumya k <skoduri@redhat.com>
CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
This commit is contained in:
Kaleb S KEITHLEY 2016-05-15 10:51:41 -04:00 committed by Kaleb KEITHLEY
parent 85de0c8339
commit 5daa68bbdd

View File

@ -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}
}