diff options
| author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2016-05-15 11:01:28 -0400 |
|---|---|---|
| committer | Kaleb KEITHLEY <kkeithle@redhat.com> | 2016-05-16 13:18:19 -0700 |
| commit | 3a6172dd9715f0a4088ca0a823c98b86b6b39112 (patch) | |
| tree | 3917c90db9478d6081cfb6e9d1a4af96673f3028 | |
| parent | 74ab2d6f10f6494785c5eeb62169317904aabc57 (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: I6a0c8ac413f9f01c7eb4fd85dde7cc9d0b4251ea
BUG: 1336198
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/14344
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>
| -rw-r--r-- | extras/ganesha/ocf/ganesha_mon | 9 |
1 files changed, 7 insertions, 2 deletions
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} } |