a98bf512c4
Remove OCF script code to monitor I/F status and fail the service when the I/F is down. On the other change, the monitor work is done by SM, to perform swact based on healthy state of both controllers. Depends: Ifa7453136f34768b99e2bcd741d1065e69ef452e Story: 2003577 Task: 24900 Change-Id: Ie3da54940054ef5c1880dae718272be1663026d8 Signed-off-by: Bin Qian <bin.qian@windriver.com>
62 lines
1.6 KiB
Diff
62 lines
1.6 KiB
Diff
From c3448b1536d50291dc5ca49dce5957c39403cc82 Mon Sep 17 00:00:00 2001
|
|
From: Bin Qian <bin.qian@windriver.com>
|
|
Date: Wed, 29 Aug 2018 11:00:22 -0400
|
|
Subject: [PATCH 1/1] avoid failing service when I/F is down
|
|
|
|
---
|
|
heartbeat/IPaddr2 | 24 ++++++------------------
|
|
1 file changed, 6 insertions(+), 18 deletions(-)
|
|
|
|
diff --git a/heartbeat/IPaddr2 b/heartbeat/IPaddr2
|
|
index 86009b9..2da5c5e 100755
|
|
--- a/heartbeat/IPaddr2
|
|
+++ b/heartbeat/IPaddr2
|
|
@@ -885,12 +885,8 @@ ip_start() {
|
|
then
|
|
exit $OCF_SUCCESS
|
|
else
|
|
- if [ "$OCF_RESKEY_dc" = "yes" ]; then
|
|
- ocf_log info "NIC $NIC is DOWN..."
|
|
- exit $OCF_SUCCESS
|
|
- else
|
|
- exit $OCF_ERR_GENERIC
|
|
- fi
|
|
+ ocf_log info "NIC $NIC is DOWN..."
|
|
+ exit $OCF_SUCCESS
|
|
fi
|
|
fi
|
|
|
|
@@ -954,12 +950,8 @@ ip_start() {
|
|
then
|
|
exit $OCF_SUCCESS
|
|
else
|
|
- if [ "$OCF_RESKEY_dc" = "yes" ]; then
|
|
- ocf_log info "NIC $NIC is DOWN"
|
|
- exit $OCF_SUCCESS
|
|
- else
|
|
- exit $OCF_ERR_GENERIC
|
|
- fi
|
|
+ ocf_log info "NIC $NIC is DOWN"
|
|
+ exit $OCF_SUCCESS
|
|
fi
|
|
}
|
|
|
|
@@ -1040,12 +1032,8 @@ ip_monitor() {
|
|
then
|
|
return $OCF_SUCCESS
|
|
else
|
|
- if [ "$OCF_RESKEY_dc" = "yes" ]; then
|
|
- ocf_log info "NIC $NIC is DOWN"
|
|
- return $OCF_SUCCESS
|
|
- else
|
|
- return $OCF_NOT_RUNNING
|
|
- fi
|
|
+ ocf_log info "NIC $NIC is DOWN"
|
|
+ return $OCF_SUCCESS
|
|
fi
|
|
;;
|
|
partial|no|partial2)
|
|
--
|
|
1.8.3.1
|
|
|