|
 |
12a457 |
From 06f86bae9a0b94850d6006fb7b65b8ecf8d57dcd Mon Sep 17 00:00:00 2001
|
|
|
12a457 |
From: Kaleb S KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
Date: Sun, 15 May 2016 11:06:08 -0400
|
|
|
12a457 |
Subject: [PATCH 153/158] common-ha: floating IP (VIP) doesn't fail over when ganesha.nfsd dies
|
|
|
12a457 |
|
|
|
12a457 |
restore mistaken removal of 'attrd_updater delete grace-active' to
|
|
|
12a457 |
trigger fail-over
|
|
|
12a457 |
|
|
|
12a457 |
original was:
|
|
|
12a457 |
attrd_updater -D -n grace-active
|
|
|
12a457 |
sleep
|
|
|
12a457 |
attrd_updater -D -n ganesha-active
|
|
|
12a457 |
|
|
|
12a457 |
mistake was:
|
|
|
12a457 |
sleep
|
|
|
12a457 |
attrd_updater -D -n grace-active
|
|
|
12a457 |
|
|
|
12a457 |
Change-Id: I0c69c363301735d3ff150e13637e715240a343fc
|
|
|
12a457 |
BUG: 1335826
|
|
|
12a457 |
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
|
|
|
12a457 |
Reviewed-on: https://code.engineering.redhat.com/gerrit/74330
|
|
|
12a457 |
Reviewed-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
12a457 |
Tested-by: Soumya Koduri <skoduri@redhat.com>
|
|
|
12a457 |
---
|
|
|
12a457 |
extras/ganesha/ocf/ganesha_mon | 9 +++++++--
|
|
|
12a457 |
1 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
12a457 |
|
|
|
12a457 |
diff --git a/extras/ganesha/ocf/ganesha_mon b/extras/ganesha/ocf/ganesha_mon
|
|
|
12a457 |
index 65450b8..dbb9eaa 100644
|
|
|
12a457 |
--- a/extras/ganesha/ocf/ganesha_mon
|
|
|
12a457 |
+++ b/extras/ganesha/ocf/ganesha_mon
|
|
|
12a457 |
@@ -173,8 +173,6 @@ ganesha_mon_monitor()
|
|
|
12a457 |
# the remaining ganesha.nfsds into grace before
|
|
|
12a457 |
# initiating the VIP fail-over.
|
|
|
12a457 |
|
|
|
12a457 |
- sleep ${OCF_RESKEY_grace_delay}
|
|
|
12a457 |
-
|
|
|
12a457 |
attrd_updater -D -n ${OCF_RESKEY_grace_active}
|
|
|
12a457 |
if [ $? -ne 0 ]; then
|
|
|
12a457 |
ocf_log info "warning: attrd_updater -D -n ${OCF_RESKEY_grace_active} failed"
|
|
|
12a457 |
@@ -185,6 +183,13 @@ ganesha_mon_monitor()
|
|
|
12a457 |
ocf_log info "warning: crm_attribute --node=${short_host} --name=${OCF_RESKEY_grace_active} --update=0 failed"
|
|
|
12a457 |
fi
|
|
|
12a457 |
|
|
|
12a457 |
+ sleep ${OCF_RESKEY_grace_delay}
|
|
|
12a457 |
+
|
|
|
12a457 |
+ attrd_updater -D -n ${OCF_RESKEY_ganesha_active}
|
|
|
12a457 |
+ if [ $? -ne 0 ]; then
|
|
|
12a457 |
+ ocf_log info "warning: attrd_updater -D -n ${OCF_RESKEY_ganesha_active} failed"
|
|
|
12a457 |
+ fi
|
|
|
12a457 |
+
|
|
|
12a457 |
return ${OCF_SUCCESS}
|
|
|
12a457 |
}
|
|
|
12a457 |
|
|
|
12a457 |
--
|
|
|
12a457 |
1.7.1
|
|
|
12a457 |
|