summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorKaleb S KEITHLEY <kkeithle@redhat.com>2016-05-15 11:03:02 -0400
committerKaleb KEITHLEY <kkeithle@redhat.com>2016-05-15 18:25:48 -0700
commite9ffc36fef8e1a96601c9cdd2dc76e45f320e301 (patch)
treeb1f3a7a8a99a2d1101885c0256695aaa8cc1aae5 /extras
parent4b9f7d06fd22232affd0af4fd57351ee57b7c361 (diff)
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 <kkeithle@redhat.com> Reviewed-on: http://review.gluster.org/14345 Smoke: Gluster Build System <jenkins@build.gluster.com> Reviewed-by: soumya k <skoduri@redhat.com> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org> CentOS-regression: Gluster Build System <jenkins@build.gluster.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/ganesha/ocf/ganesha_mon9
1 files changed, 7 insertions, 2 deletions
diff --git a/extras/ganesha/ocf/ganesha_mon b/extras/ganesha/ocf/ganesha_mon
index 65450b8..dbb9eaa 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}
}